From a9d4e890d3edebe36a9f8be0d8a3c1fc42ddf785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA?= <280645618@qq.com> Date: Sun, 18 Jan 2026 16:59:54 +0800 Subject: [PATCH] pdd --- api/erp-api/pom.xml | 10 +- .../AfterSaleProcessingController.java | 2 +- .../controller/OfflineGoodsController.java | 2 +- .../controller/OfflineOrderController.java | 2 +- .../controller/OfflineRefundController.java | 2 +- .../erp/controller/OfflineShipController.java | 2 +- .../erp/controller/OrderController.java | 4 +- .../erp/controller/OrderItemController.java | 4 +- .../erp/controller/OrderShipController.java | 4 +- .../erp/controller/RefundController.java | 2 +- .../erp/controller/ReportController.java | 4 +- .../erp/controller/ShipmentController.java | 4 +- .../erp/mq/ApiMessageServiceImpl.java | 326 +++++++------- docs/qihang-erp.sql | 4 +- .../qihangerp}/mapper/OGoodsBrandMapper.java | 2 +- .../mapper/OGoodsCategoryAttributeMapper.java | 2 +- .../OGoodsCategoryAttributeValueMapper.java | 2 +- .../mapper/OGoodsCategoryMapper.java | 2 +- .../mapper/OGoodsInventoryBatchMapper.java | 2 +- .../mapper/OGoodsInventoryMapper.java | 2 +- .../cn/qihangerp}/mapper/OGoodsMapper.java | 2 +- .../mapper/OGoodsSkuAttrMapper.java | 2 +- .../cn/qihangerp}/mapper/OGoodsSkuMapper.java | 2 +- .../mapper/OGoodsSupplierMapper.java | 2 +- .../resources/mapper/OGoodsBrandMapper.xml | 2 +- .../mapper/OGoodsCategoryAttributeMapper.xml | 2 +- .../OGoodsCategoryAttributeValueMapper.xml | 2 +- .../resources/mapper/OGoodsCategoryMapper.xml | 2 +- .../mapper/OGoodsInventoryBatchMapper.xml | 2 +- .../mapper/OGoodsInventoryMapper.xml | 2 +- .../main/resources/mapper/OGoodsMapper.xml | 2 +- .../resources/mapper/OGoodsSkuAttrMapper.xml | 2 +- .../main/resources/mapper/OGoodsSkuMapper.xml | 2 +- .../resources/mapper/OGoodsSupplierMapper.xml | 2 +- .../qihangerp/model/entity/PddOrderItem.java | 3 - .../service/ErpShipmentItemService.java | 2 +- .../module}/service/ErpShipmentService.java | 2 +- .../module}/service/OAfterSaleService.java | 2 +- .../module}/service/OOrderItemService.java | 2 +- .../module}/service/OOrderService.java | 3 +- .../service/OOrderShipListItemService.java | 2 +- .../service/OOrderShipListService.java | 2 +- .../module}/service/ORefundService.java | 2 +- .../module}/service/OShipStockUpService1.java | 0 .../module}/service/OShipWaybillService.java | 2 +- .../service/OfflineGoodsSkuService.java | 2 +- .../service/OfflineOrderItemService.java | 2 +- .../module}/service/OfflineOrderService.java | 2 +- .../module}/service/OfflineRefundService.java | 2 +- .../impl/ErpShipmentItemServiceImpl.java | 4 +- .../service/impl/ErpShipmentServiceImpl.java | 4 +- .../service/impl/OAfterSaleServiceImpl.java | 4 +- .../service/impl/OOrderItemServiceImpl.java | 7 +- .../service/impl/OOrderServiceImpl.java | 21 +- .../impl/OOrderShipListItemServiceImpl.java | 6 +- .../impl/OOrderShipListServiceImpl.java | 7 +- .../service/impl/ORefundServiceImpl.java | 10 +- .../impl/OShipStockUpServiceImpl1.java | 0 .../service/impl/OShipWaybillServiceImpl.java | 4 +- .../impl/OfflineGoodsSkuServiceImpl.java | 9 +- .../impl/OfflineOrderItemServiceImpl.java | 4 +- .../service/impl/OfflineOrderServiceImpl.java | 4 +- .../impl/OfflineRefundServiceImpl.java | 4 +- .../dou/service/impl/DouGoodsServiceImpl.java | 6 +- .../service/impl/OGoodsBrandServiceImpl.java | 2 +- .../OGoodsCategoryAttributeServiceImpl.java | 2 +- ...oodsCategoryAttributeValueServiceImpl.java | 2 +- .../impl/OGoodsCategoryServiceImpl.java | 6 +- .../impl/OGoodsInventoryBatchServiceImpl.java | 2 +- .../impl/OGoodsInventoryServiceImpl.java | 2 +- .../goods/service/impl/OGoodsServiceImpl.java | 8 +- .../impl/OGoodsSkuAttrServiceImpl.java | 2 +- .../service/impl/OGoodsSkuServiceImpl.java | 2 +- .../impl/OGoodsSupplierServiceImpl.java | 2 +- .../jd/service/impl/JdGoodsServiceImpl.java | 6 +- .../service/msg/PddOrderMessageService.java | 414 ------------------ .../pdd/service/impl/PddGoodsServiceImpl.java | 6 +- .../pdd/service/impl/PddOrderServiceImpl.java | 63 ++- serviceImpl/pom.xml | 2 +- .../tao/service/impl/TaoGoodsServiceImpl.java | 6 +- .../wei/service/impl/WeiGoodsServiceImpl.java | 6 +- 81 files changed, 324 insertions(+), 745 deletions(-) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsBrandMapper.java (89%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsCategoryAttributeMapper.java (90%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsCategoryAttributeValueMapper.java (91%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsCategoryMapper.java (89%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsInventoryBatchMapper.java (90%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsInventoryMapper.java (90%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsMapper.java (91%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsSkuAttrMapper.java (89%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsSkuMapper.java (89%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods => mapper/src/main/java/cn/qihangerp}/mapper/OGoodsSupplierMapper.java (89%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsBrandMapper.xml (92%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml (89%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml (90%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsCategoryMapper.xml (95%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml (96%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsInventoryMapper.xml (95%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsMapper.xml (98%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsSkuAttrMapper.xml (92%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsSkuMapper.xml (97%) rename {serviceImpl/goods => mapper}/src/main/resources/mapper/OGoodsSupplierMapper.xml (96%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/ErpShipmentItemService.java (88%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/ErpShipmentService.java (93%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OAfterSaleService.java (91%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OOrderItemService.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OOrderService.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OOrderShipListItemService.java (94%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OOrderShipListService.java (96%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/ORefundService.java (97%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OShipStockUpService1.java (100%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OShipWaybillService.java (89%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OfflineGoodsSkuService.java (94%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OfflineOrderItemService.java (89%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OfflineOrderService.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/OfflineRefundService.java (92%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/ErpShipmentItemServiceImpl.java (83%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/ErpShipmentServiceImpl.java (97%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OAfterSaleServiceImpl.java (94%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OOrderItemServiceImpl.java (96%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OOrderServiceImpl.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OOrderShipListItemServiceImpl.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OOrderShipListServiceImpl.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/ORefundServiceImpl.java (99%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OShipStockUpServiceImpl1.java (100%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OShipWaybillServiceImpl.java (82%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OfflineGoodsSkuServiceImpl.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OfflineOrderItemServiceImpl.java (82%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OfflineOrderServiceImpl.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order => service/src/main/java/cn/qihangerp/module}/service/impl/OfflineRefundServiceImpl.java (91%) delete mode 100644 serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/msg/PddOrderMessageService.java diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml index 32b1690e..d54c8066 100644 --- a/api/erp-api/pom.xml +++ b/api/erp-api/pom.xml @@ -100,11 +100,11 @@ - - cn.qihangerp.service - order - 2.0.0 - + + + + + diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java index 0980968c..9abb7024 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/AfterSaleProcessingController.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.OAfterSale; -import cn.qihangerp.module.order.service.OAfterSaleService; +import cn.qihangerp.module.service.OAfterSaleService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java index 94d4bdd5..f5c03326 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineGoodsController.java @@ -6,7 +6,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.OfflineGoodsSku; -import cn.qihangerp.module.order.service.OfflineGoodsSkuService; +import cn.qihangerp.module.service.OfflineGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java index 65c34c14..862f729d 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineOrderController.java @@ -10,7 +10,7 @@ import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.model.bo.OfflineOrderCreateBo; import cn.qihangerp.model.bo.OfflineOrderPushBo; -import cn.qihangerp.module.order.service.OfflineOrderService; +import cn.qihangerp.module.service.OfflineOrderService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java index 61d1ca6f..3e1ca423 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineRefundController.java @@ -3,7 +3,7 @@ package cn.qihangerp.erp.controller; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.request.RefundSearchRequest; -import cn.qihangerp.module.order.service.OfflineRefundService; +import cn.qihangerp.module.service.OfflineRefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java index 0de742c3..c062ca60 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OfflineShipController.java @@ -9,7 +9,7 @@ import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OfflineOrder; import cn.qihangerp.model.bo.OfflineOrderShipBo; import cn.qihangerp.model.bo.OrderShipSendBo; -import cn.qihangerp.module.order.service.OfflineOrderService; +import cn.qihangerp.module.service.OfflineOrderService; import cn.qihangerp.security.common.BaseController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java index d2a7bbf6..992f4fdf 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderController.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.*; import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.model.bo.OrderAllocateShipRequest; import cn.qihangerp.model.bo.OrderShipRequest; -import cn.qihangerp.module.order.service.OOrderItemService; -import cn.qihangerp.module.order.service.OOrderService; +import cn.qihangerp.module.service.OOrderItemService; +import cn.qihangerp.module.service.OOrderService; import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java index 05136235..4c65bafb 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderItemController.java @@ -7,8 +7,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.bo.OrderItemListBo; -import cn.qihangerp.module.order.service.OOrderItemService; -import cn.qihangerp.module.order.service.OOrderService; +import cn.qihangerp.module.service.OOrderItemService; +import cn.qihangerp.module.service.OOrderService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java index 9b8996dd..66570c4f 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/OrderShipController.java @@ -8,8 +8,8 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.bo.ShipStockUpBo; import cn.qihangerp.model.bo.SupplierOrderShipBo; -import cn.qihangerp.module.order.service.OOrderShipListItemService; -import cn.qihangerp.module.order.service.OOrderShipListService; +import cn.qihangerp.module.service.OOrderShipListItemService; +import cn.qihangerp.module.service.OOrderShipListService; import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSON; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java index 896d5d83..9ae27375 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/RefundController.java @@ -8,7 +8,7 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.bo.RefundProcessingBo; import cn.qihangerp.model.bo.RefundSearchBo; -import cn.qihangerp.module.order.service.ORefundService; +import cn.qihangerp.module.service.ORefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java index 986fe165..eeec470b 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.model.vo.SalesDailyVo; import cn.qihangerp.model.vo.SalesTopSkuVo; -import cn.qihangerp.module.order.service.OOrderItemService; -import cn.qihangerp.module.order.service.OOrderService; +import cn.qihangerp.module.service.OOrderItemService; +import cn.qihangerp.module.service.OOrderService; import cn.qihangerp.module.service.OShopService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java index 5e401d9c..e744fe43 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ShipmentController.java @@ -7,8 +7,8 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.OShipment; import cn.qihangerp.model.bo.OrderShipBo; -import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.module.order.service.ErpShipmentService; +import cn.qihangerp.module.service.OOrderService; +import cn.qihangerp.module.service.ErpShipmentService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.util.StringUtils; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java index 84a95f53..3f8bee06 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/mq/ApiMessageServiceImpl.java @@ -1,164 +1,164 @@ -package cn.qihangerp.erp.mq; - -import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.mq.MqMessage; -import cn.qihangerp.common.mq.MqType; -import cn.qihangerp.common.utils.SpringUtils; -import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.module.order.service.ORefundService; -import cn.qihangerp.module.order.service.ErpShipmentService; -import cn.qihangerp.module.service.ApiMessageService; -import cn.qihangerp.erp.feign.OpenApiService; -import com.alibaba.fastjson2.JSONObject; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@AllArgsConstructor -@Slf4j -@Service -public class ApiMessageServiceImpl implements ApiMessageService { - private final OpenApiService openApiService; -// private final PddApiService pddApiService; -// private final TaoApiService taoApiService; -// private final JdApiService jdApiService; -// private final DouApiService douApiService; -// private final WeiApiService weiApiService; - - @Override - public ResultVo messageHandle(MqMessage mqMessage) { - if (mqMessage.getMqType() == MqType.ORDER_MESSAGE) { - // 有新订单，插入新订单到shop_order - OOrderService orderService = SpringUtils.getBean(OOrderService.class); - if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) { - log.info("订单消息JD"); - JSONObject jsonObject = openApiService.getJdOrderDetail(Long.parseLong(mqMessage.getKeyId()), 0); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====jdpop order message===没有找到订单"); - return ResultVo.error(404, "没有找到订单"); - } - JSONObject orderDetail = jsonObject.getJSONObject("data"); - orderService.jdOrderMessage(mqMessage.getKeyId(),orderDetail); - - } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { - log.info("订单消息TAO"); - JSONObject jsonObject = openApiService.getTaoOrderDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.error("===查询原始订单错误==={}",jsonObject.getString("msg")); - log.info("=====tao order message===没有找到订单"); - return ResultVo.error(404, "没有找到订单"); - } - - JSONObject orderDetail = jsonObject.getJSONObject("data"); - orderService.taoOrderMessage(mqMessage.getKeyId(), orderDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { - log.info("订单消息PDD"); - JSONObject jsonObject = openApiService.getPddOrderDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====pdd order message===没有找到订单:{}",jsonObject.getString("msg")); - return ResultVo.error(404, "没有找到订单"); - } - - JSONObject orderDetail = jsonObject.getJSONObject("data"); - ResultVo longResultVo = orderService.pddOrderMessage(mqMessage.getKeyId(), orderDetail); - log.info("===========pdd order message result={}",JSONObject.toJSONString(longResultVo)); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { - log.info("订单消息DOU"); - JSONObject jsonObject = openApiService.getDouOrderDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====dou order message===没有找到订单"); - return ResultVo.error(404, "没有找到订单"); - } - - JSONObject orderDetail = jsonObject.getJSONObject("data"); - orderService.douOrderMessage(mqMessage.getKeyId(), orderDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { - log.info("订单消息OFFLINE"); - orderService.offlineOrderMessage(mqMessage.getKeyId()); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { - log.info("订单消息WEI"); - JSONObject jsonObject = openApiService.getWeiOrderDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====wei order message===没有找到订单"); - return ResultVo.error(404, "没有找到订单"); - } - - JSONObject orderDetail = jsonObject.getJSONObject("data"); - orderService.weiOrderMessage(mqMessage.getKeyId(), orderDetail); - } - - } else if (mqMessage.getMqType() == MqType.REFUND_MESSAGE) { - // 售后消息 - ORefundService refundService = SpringUtils.getBean(ORefundService.class); - if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) { - log.info("退款消息JD"); -// log.info("=====jd refund message===消息处理" + serviceId); - JSONObject jsonObject = openApiService.getJdRefundDetail(Long.parseLong(mqMessage.getKeyId()), 0); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====jd refund message===没有找到退款单"); - return ResultVo.error(404, "没有找到退款单"); - } - - JSONObject refundDetail = jsonObject.getJSONObject("data"); - refundService.jdRefundMessage(mqMessage.getKeyId(), refundDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { - log.info("退款消息TAO"); - JSONObject jsonObject = openApiService.getTaoRefundDetail(Long.parseLong(mqMessage.getKeyId())); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====tao refund message===没有找到退款单"); - return ResultVo.error(404, "没有找到退款单"); - } - - JSONObject refundDetail = jsonObject.getJSONObject("data"); - refundService.taoRefundMessage(mqMessage.getKeyId(), refundDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { - log.info("退款消息PDD"); - JSONObject jsonObject = openApiService.getPddRefundDetail(Long.parseLong(mqMessage.getKeyId())); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====pdd refund message===没有找到退款单"); - return ResultVo.error(404, "没有找到退款单"); - } - - JSONObject refundDetail = jsonObject.getJSONObject("data"); - refundService.pddRefundMessage(mqMessage.getKeyId(), refundDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { - log.info("退款消息DOU"); - JSONObject jsonObject = openApiService.getDouRefundDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====dou refund message===没有找到退款单"); - return ResultVo.error(404, "没有找到退款单"); - } - - JSONObject refundDetail = jsonObject.getJSONObject("data"); - refundService.douRefundMessage(mqMessage.getKeyId(), refundDetail); - } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { - log.info("退款消息WEI"); - JSONObject jsonObject = openApiService.getWeiRefundDetail(mqMessage.getKeyId()); - if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { - log.info("=====dou refund message===没有找到退款单"); - return ResultVo.error(404, "没有找到退款单"); - } - - JSONObject refundDetail = jsonObject.getJSONObject("data"); - refundService.weiRefundMessage(mqMessage.getKeyId(), refundDetail); - } - } else if (mqMessage.getMqType() == MqType.SHIP_STOCKUP_MESSAGE) { - // 备货消息 - log.info("=================收到备货消息=============="); - if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { - ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); -// shipmentService.shipStockup(mqMessage.getKeyId(), EnumShopType.OFFLINE); - } - } else if (mqMessage.getMqType() == MqType.SHIP_SEND_MESSAGE) { - // 发货消息 - log.info("=================收到发货消息=============="); - if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { - ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); -// shipmentService.shipSendMessage(mqMessage.getKeyId(), EnumShopType.OFFLINE, mqMessage.getData1(), mqMessage.getData2()); +//package cn.qihangerp.erp.mq; +// +//import cn.qihangerp.common.ResultVo; +//import cn.qihangerp.common.enums.EnumShopType; +//import cn.qihangerp.common.mq.MqMessage; +//import cn.qihangerp.common.mq.MqType; +//import cn.qihangerp.common.utils.SpringUtils; +//import cn.qihangerp.module.service.OOrderService; +//import cn.qihangerp.module.service.ORefundService; +//import cn.qihangerp.module.service.ErpShipmentService; +//import cn.qihangerp.module.service.ApiMessageService; +//import cn.qihangerp.erp.feign.OpenApiService; +//import com.alibaba.fastjson2.JSONObject; +//import lombok.AllArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.stereotype.Service; +// +//@AllArgsConstructor +//@Slf4j +//@Service +//public class ApiMessageServiceImpl implements ApiMessageService { +// private final OpenApiService openApiService; +//// private final PddApiService pddApiService; +//// private final TaoApiService taoApiService; +//// private final JdApiService jdApiService; +//// private final DouApiService douApiService; +//// private final WeiApiService weiApiService; +// +// @Override +// public ResultVo messageHandle(MqMessage mqMessage) { +// if (mqMessage.getMqType() == MqType.ORDER_MESSAGE) { +// // 有新订单，插入新订单到shop_order +// OOrderService orderService = SpringUtils.getBean(OOrderService.class); +// if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) { +// log.info("订单消息JD"); +// JSONObject jsonObject = openApiService.getJdOrderDetail(Long.parseLong(mqMessage.getKeyId()), 0); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====jdpop order message===没有找到订单"); +// return ResultVo.error(404, "没有找到订单"); +// } +// JSONObject orderDetail = jsonObject.getJSONObject("data"); +// orderService.jdOrderMessage(mqMessage.getKeyId(),orderDetail); +// +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { +// log.info("订单消息TAO"); +// JSONObject jsonObject = openApiService.getTaoOrderDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.error("===查询原始订单错误==={}",jsonObject.getString("msg")); +// log.info("=====tao order message===没有找到订单"); +// return ResultVo.error(404, "没有找到订单"); +// } +// +// JSONObject orderDetail = jsonObject.getJSONObject("data"); +// orderService.taoOrderMessage(mqMessage.getKeyId(), orderDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { +// log.info("订单消息PDD"); +// JSONObject jsonObject = openApiService.getPddOrderDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====pdd order message===没有找到订单:{}",jsonObject.getString("msg")); +// return ResultVo.error(404, "没有找到订单"); +// } +// +// JSONObject orderDetail = jsonObject.getJSONObject("data"); +// ResultVo longResultVo = orderService.pddOrderMessage(mqMessage.getKeyId(), orderDetail); +// log.info("===========pdd order message result={}",JSONObject.toJSONString(longResultVo)); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { +// log.info("订单消息DOU"); +// JSONObject jsonObject = openApiService.getDouOrderDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====dou order message===没有找到订单"); +// return ResultVo.error(404, "没有找到订单"); +// } +// +// JSONObject orderDetail = jsonObject.getJSONObject("data"); +// orderService.douOrderMessage(mqMessage.getKeyId(), orderDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { +// log.info("订单消息OFFLINE"); // orderService.offlineOrderMessage(mqMessage.getKeyId()); - } - } - return null; - } -} +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { +// log.info("订单消息WEI"); +// JSONObject jsonObject = openApiService.getWeiOrderDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====wei order message===没有找到订单"); +// return ResultVo.error(404, "没有找到订单"); +// } +// +// JSONObject orderDetail = jsonObject.getJSONObject("data"); +// orderService.weiOrderMessage(mqMessage.getKeyId(), orderDetail); +// } +// +// } else if (mqMessage.getMqType() == MqType.REFUND_MESSAGE) { +// // 售后消息 +// ORefundService refundService = SpringUtils.getBean(ORefundService.class); +// if (mqMessage.getShopType().getIndex() == EnumShopType.JD.getIndex()) { +// log.info("退款消息JD"); +//// log.info("=====jd refund message===消息处理" + serviceId); +// JSONObject jsonObject = openApiService.getJdRefundDetail(Long.parseLong(mqMessage.getKeyId()), 0); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====jd refund message===没有找到退款单"); +// return ResultVo.error(404, "没有找到退款单"); +// } +// +// JSONObject refundDetail = jsonObject.getJSONObject("data"); +// refundService.jdRefundMessage(mqMessage.getKeyId(), refundDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.TAO.getIndex()) { +// log.info("退款消息TAO"); +// JSONObject jsonObject = openApiService.getTaoRefundDetail(Long.parseLong(mqMessage.getKeyId())); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====tao refund message===没有找到退款单"); +// return ResultVo.error(404, "没有找到退款单"); +// } +// +// JSONObject refundDetail = jsonObject.getJSONObject("data"); +// refundService.taoRefundMessage(mqMessage.getKeyId(), refundDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.PDD.getIndex()) { +// log.info("退款消息PDD"); +// JSONObject jsonObject = openApiService.getPddRefundDetail(Long.parseLong(mqMessage.getKeyId())); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====pdd refund message===没有找到退款单"); +// return ResultVo.error(404, "没有找到退款单"); +// } +// +// JSONObject refundDetail = jsonObject.getJSONObject("data"); +// refundService.pddRefundMessage(mqMessage.getKeyId(), refundDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.DOU.getIndex()) { +// log.info("退款消息DOU"); +// JSONObject jsonObject = openApiService.getDouRefundDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====dou refund message===没有找到退款单"); +// return ResultVo.error(404, "没有找到退款单"); +// } +// +// JSONObject refundDetail = jsonObject.getJSONObject("data"); +// refundService.douRefundMessage(mqMessage.getKeyId(), refundDetail); +// } else if (mqMessage.getShopType().getIndex() == EnumShopType.WEI.getIndex()) { +// log.info("退款消息WEI"); +// JSONObject jsonObject = openApiService.getWeiRefundDetail(mqMessage.getKeyId()); +// if (jsonObject.getInteger("code") != 200 || jsonObject.getJSONObject("data") == null) { +// log.info("=====dou refund message===没有找到退款单"); +// return ResultVo.error(404, "没有找到退款单"); +// } +// +// JSONObject refundDetail = jsonObject.getJSONObject("data"); +// refundService.weiRefundMessage(mqMessage.getKeyId(), refundDetail); +// } +// } else if (mqMessage.getMqType() == MqType.SHIP_STOCKUP_MESSAGE) { +// // 备货消息 +// log.info("=================收到备货消息=============="); +// if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { +// ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); +//// shipmentService.shipStockup(mqMessage.getKeyId(), EnumShopType.OFFLINE); +// } +// } else if (mqMessage.getMqType() == MqType.SHIP_SEND_MESSAGE) { +// // 发货消息 +// log.info("=================收到发货消息=============="); +// if (mqMessage.getShopType().getIndex() == EnumShopType.OFFLINE.getIndex()) { +// ErpShipmentService shipmentService = SpringUtils.getBean(ErpShipmentService.class); +//// shipmentService.shipSendMessage(mqMessage.getKeyId(), EnumShopType.OFFLINE, mqMessage.getData1(), mqMessage.getData2()); +//// orderService.offlineOrderMessage(mqMessage.getKeyId()); +// } +// } +// return null; +// } +//} diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index 91efe245..12ce373c 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -2995,11 +2995,9 @@ CREATE TABLE `oms_pdd_order_item` ( `outer_id` varchar(35) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '商家外部编码（sku）', `goods_count` int NOT NULL COMMENT '商品数量', `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', - `o_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)', - `o_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)', PRIMARY KEY (`id`) USING BTREE, INDEX `index_order_sn`(`order_sn` ASC) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1976126504091607207 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '拼多多订单明细表' ROW_FORMAT = DYNAMIC; -- ---------------------------- -- Records of oms_pdd_order_item diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsBrandMapper.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsBrandMapper.java index 804eb597..111f3c54 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsBrandMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsBrand; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeMapper.java similarity index 90% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeMapper.java index 2e69292e..54382c4f 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeValueMapper.java similarity index 91% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeValueMapper.java index 8f1762f2..bec0c7dc 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryAttributeValueMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryMapper.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryMapper.java index 1c887346..662dde6b 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsCategoryMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryBatchMapper.java similarity index 90% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryBatchMapper.java index 81cbc87b..1a7a1d2b 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryBatchMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsInventoryBatch; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryMapper.java similarity index 90% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryMapper.java index 59acd4b2..c85f7eec 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsInventoryMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsInventory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsMapper.java similarity index 91% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsMapper.java index ff309f44..1cfc8151 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.vo.GoodsSpecListVo; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuAttrMapper.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuAttrMapper.java index eaa0feaa..db5fc864 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuAttrMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsSkuAttr; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuMapper.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuMapper.java index b917c8fc..72207d8a 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSkuMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSupplierMapper.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/OGoodsSupplierMapper.java index f958badd..25acc349 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/OGoodsSupplierMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.OGoodsSupplier; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml b/mapper/src/main/resources/mapper/OGoodsBrandMapper.xml similarity index 92% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml rename to mapper/src/main/resources/mapper/OGoodsBrandMapper.xml index 2126c976..b66e2369 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsBrandMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml b/mapper/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml similarity index 89% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml rename to mapper/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml index 064408a6..d65240eb 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml b/mapper/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml similarity index 90% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml rename to mapper/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml index 915dd8b1..794aaef3 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml b/mapper/src/main/resources/mapper/OGoodsCategoryMapper.xml similarity index 95% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml rename to mapper/src/main/resources/mapper/OGoodsCategoryMapper.xml index 2c8276a6..6f90ee74 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsCategoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml b/mapper/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml similarity index 96% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml rename to mapper/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml index cb882a47..0919e669 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml b/mapper/src/main/resources/mapper/OGoodsInventoryMapper.xml similarity index 95% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml rename to mapper/src/main/resources/mapper/OGoodsInventoryMapper.xml index 5de1ba78..6d5ea839 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsInventoryMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml b/mapper/src/main/resources/mapper/OGoodsMapper.xml similarity index 98% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml rename to mapper/src/main/resources/mapper/OGoodsMapper.xml index 6fd14c2b..db76b7ac 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml b/mapper/src/main/resources/mapper/OGoodsSkuAttrMapper.xml similarity index 92% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml rename to mapper/src/main/resources/mapper/OGoodsSkuAttrMapper.xml index 4e803c6a..97b0b2f9 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsSkuAttrMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/OGoodsSkuMapper.xml similarity index 97% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/OGoodsSkuMapper.xml index 131b6c68..d661844f 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml b/mapper/src/main/resources/mapper/OGoodsSupplierMapper.xml similarity index 96% rename from serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml rename to mapper/src/main/resources/mapper/OGoodsSupplierMapper.xml index 3fca2200..e88d5d53 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml +++ b/mapper/src/main/resources/mapper/OGoodsSupplierMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java index 4bdbc818..c4af98aa 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java +++ b/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java @@ -74,8 +74,5 @@ public class PddOrderItem implements Serializable { * 备注 */ private String remark; - private String oGoodsId; - private String oGoodsSkuId; - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java b/service/src/main/java/cn/qihangerp/module/service/ErpShipmentItemService.java similarity index 88% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpShipmentItemService.java index c3e647aa..466c7221 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpShipmentItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.OShipmentItem; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java b/service/src/main/java/cn/qihangerp/module/service/ErpShipmentService.java similarity index 93% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpShipmentService.java index dafaf7cc..014b7d67 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ErpShipmentService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java b/service/src/main/java/cn/qihangerp/module/service/OAfterSaleService.java similarity index 91% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java rename to service/src/main/java/cn/qihangerp/module/service/OAfterSaleService.java index 3742f013..95f59483 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OAfterSaleService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/OOrderItemService.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/OOrderItemService.java index 4a5f053c..f7e427ca 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/service/src/main/java/cn/qihangerp/module/service/OOrderService.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/OOrderService.java index 826d2a08..357c0e5a 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OOrderService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.model.entity.OOrder; @@ -25,7 +25,6 @@ public interface OOrderService extends IService { ResultVo jdOrderMessage(String orderId, JSONObject orderDetail); ResultVo taoOrderMessage(String tid,JSONObject orderDetail ); - ResultVo pddOrderMessage(String orderSn,JSONObject orderDetail ); ResultVo douOrderMessage(String orderId,JSONObject orderDetail ); ResultVo offlineOrderMessage(String orderNum); ResultVo weiOrderMessage(String orderNum,JSONObject orderDetail ); diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java b/service/src/main/java/cn/qihangerp/module/service/OOrderShipListItemService.java similarity index 94% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java rename to service/src/main/java/cn/qihangerp/module/service/OOrderShipListItemService.java index 3c7a3753..2122febc 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OOrderShipListItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java b/service/src/main/java/cn/qihangerp/module/service/OOrderShipListService.java similarity index 96% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java rename to service/src/main/java/cn/qihangerp/module/service/OOrderShipListService.java index c4b448a7..bc240f27 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OOrderShipListService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java b/service/src/main/java/cn/qihangerp/module/service/ORefundService.java similarity index 97% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java rename to service/src/main/java/cn/qihangerp/module/service/ORefundService.java index e01d9b32..6676ec72 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java +++ b/service/src/main/java/cn/qihangerp/module/service/ORefundService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.ORefund; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java b/service/src/main/java/cn/qihangerp/module/service/OShipStockUpService1.java similarity index 100% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipStockUpService1.java rename to service/src/main/java/cn/qihangerp/module/service/OShipStockUpService1.java diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java b/service/src/main/java/cn/qihangerp/module/service/OShipWaybillService.java similarity index 89% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java rename to service/src/main/java/cn/qihangerp/module/service/OShipWaybillService.java index e0608e48..c93d1f22 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OShipWaybillService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.OShipWaybill; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/OfflineGoodsSkuService.java similarity index 94% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/OfflineGoodsSkuService.java index 9c720e16..b48ec77d 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OfflineGoodsSkuService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/OfflineOrderItemService.java similarity index 89% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/OfflineOrderItemService.java index 2127d844..020b0ef5 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OfflineOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.OfflineOrderItem; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java b/service/src/main/java/cn/qihangerp/module/service/OfflineOrderService.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/OfflineOrderService.java index 36ef8d39..39528f6d 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OfflineOrderService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java b/service/src/main/java/cn/qihangerp/module/service/OfflineRefundService.java similarity index 92% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/OfflineRefundService.java index b2659a86..e28026ab 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OfflineRefundService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentItemServiceImpl.java similarity index 83% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentItemServiceImpl.java index fc1d9983..fffa7bc2 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentItemServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.OShipmentItem; import cn.qihangerp.mapper.OShipmentItemMapper; -import cn.qihangerp.module.order.service.ErpShipmentItemService; +import cn.qihangerp.module.service.ErpShipmentItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentServiceImpl.java similarity index 97% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentServiceImpl.java index 9a8e8673..6d881622 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpShipmentServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -12,7 +12,7 @@ import cn.qihangerp.model.entity.OShipmentItem; import cn.qihangerp.model.bo.OrderShipBo; import cn.qihangerp.mapper.OShipmentItemMapper; import cn.qihangerp.mapper.OShipmentMapper; -import cn.qihangerp.module.order.service.ErpShipmentService; +import cn.qihangerp.module.service.ErpShipmentService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OAfterSaleServiceImpl.java similarity index 94% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OAfterSaleServiceImpl.java index ed8629cd..46aaff3d 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OAfterSaleServiceImpl.java @@ -1,10 +1,10 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.model.entity.OAfterSale; import cn.qihangerp.mapper.OAfterSaleMapper; -import cn.qihangerp.module.order.service.OAfterSaleService; +import cn.qihangerp.module.service.OAfterSaleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderItemServiceImpl.java similarity index 96% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OOrderItemServiceImpl.java index f8871003..5179c300 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderItemServiceImpl.java @@ -1,14 +1,13 @@ -package cn.qihangerp.module.order.service.impl; - +package cn.qihangerp.module.service.impl; +import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.model.bo.OrderItemListBo; import cn.qihangerp.model.vo.OrderItemListVo; import cn.qihangerp.model.vo.SalesTopSkuVo; import cn.qihangerp.mapper.OOrderItemMapper; -import cn.qihangerp.module.order.service.OOrderItemService; +import cn.qihangerp.module.service.OOrderItemService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java index aa441bc4..4ae91dda 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderServiceImpl.java @@ -1,17 +1,16 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.mapper.*; import cn.qihangerp.model.entity.*; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.goods.mapper.OGoodsMapper; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; -import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; +import cn.qihangerp.mapper.OGoodsMapper; +import cn.qihangerp.mapper.OGoodsSkuMapper; +import cn.qihangerp.mapper.OGoodsSupplierMapper; import cn.qihangerp.model.bo.OrderAllocateShipRequest; import cn.qihangerp.model.bo.OrderShipRequest; import cn.qihangerp.model.vo.OrderDiscountVo; import cn.qihangerp.model.vo.SalesDailyVo; -import cn.qihangerp.module.order.service.OOrderService; -import cn.qihangerp.module.order.service.msg.PddOrderMessageService; +import cn.qihangerp.module.service.OOrderService; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -21,7 +20,6 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -57,7 +55,7 @@ public class OOrderServiceImpl extends ServiceImpl private final OfflineOrderMapper offlineOrderMapper; private final OfflineOrderItemMapper offlineOrderItemMapper; - private final PddOrderMessageService pddOrderMessageService; + private final String DATE_PATTERN = @@ -82,13 +80,6 @@ public class OOrderServiceImpl extends ServiceImpl } - @Transactional - @Override - public ResultVo pddOrderMessage(String orderSn,JSONObject orderDetail ) { - log.info("=====pdd order message===订单号{}===", orderSn); - return pddOrderMessageService.pddOrderMessage(orderSn, orderDetail); - } - @Transactional @Override public ResultVo douOrderMessage(String orderId,JSONObject orderDetail ) { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListItemServiceImpl.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListItemServiceImpl.java index bc1b9ac2..7d25a034 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListItemServiceImpl.java @@ -1,16 +1,16 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.bo.ShipStockUpBo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.OOrderShipListItem; -import cn.qihangerp.module.order.service.OOrderShipListItemService; +import cn.qihangerp.module.service.OOrderShipListItemService; import cn.qihangerp.mapper.OOrderShipListItemMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListServiceImpl.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListServiceImpl.java index a9776da1..217a7418 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OOrderShipListServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -19,7 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.OOrderShipList; -import cn.qihangerp.module.order.service.OOrderShipListService; +import cn.qihangerp.module.service.OOrderShipListService; import cn.qihangerp.mapper.OOrderShipListMapper; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -141,7 +141,6 @@ public class OOrderShipListServiceImpl extends ServiceImpl pddOrderMessage(String orderSn, JSONObject orderDetail ) { - log.info("=====pdd order message===订单号{}==="+orderSn); -// JSONObject jsonObject = pddApiService.getOrderDetail(orderSn); -// if(jsonObject.getInteger("code")!=200 || jsonObject.getJSONObject("data") ==null){ -// log.info("=====pdd order message===没有找到订单"); -// return ResultVo.error(404,"没有找到订单"); -// } -// -// JSONObject orderDetail = jsonObject.getJSONObject("data"); -// log.info("=====pdd order message===订单:"+JSONObject.toJSONString(orderDetail)); - if(orderDetail == null) { - log.info("=====pdd order message===没有找到订单======="); - return ResultVo.error("没有找到订单"); - } - - JSONArray itemArray = orderDetail.getJSONArray("items"); - if (itemArray.isEmpty()) { -// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); - log.info("=====pdd order message===没有items====事务回滚======="); - return ResultVo.error("没有找到订单items"); - } -// List originOrders = pddOrderMapper.selectList(new LambdaQueryWrapper().eq(PddOrder::getOrderSn, orderSn)); -// -// if(originOrders == null || originOrders.size() == 0) { -// // 没有找到订单信息 -// return ResultVo.error(ResultVoEnum.NotFound,"没有找到PDD原始订单："+orderSn); -// } -// PddOrder originOrder = originOrders.get(0); -// PddOrder originOrder = new PddOrder(); - Long shopId = orderDetail.getLong("shopId"); - List oOrders = orderMapper.selectList(new LambdaQueryWrapper() - .eq(OOrder::getOrderNum, orderSn).eq(OOrder::getShopId,shopId)); - if(oOrders == null || oOrders.isEmpty()) { - // 新增订单 - OOrder insert = new OOrder(); - insert.setOrderNum(orderSn); - insert.setShopType(EnumShopType.PDD.getIndex()); - insert.setShopId(shopId); - insert.setBuyerMemo(orderDetail.getString("buyerMemo")); - insert.setSellerMemo(orderDetail.getString("remark")); - Integer originOrderStatus = orderDetail.getInteger("orderStatus"); - Integer originRefundStatus = orderDetail.getInteger("refundStatus"); - Integer afterSalesStatus = orderDetail.getInteger("afterSalesStatus"); - String platformStatusDesc = "未知"; - // 状态 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除 - int orderStatus = 0; - int refundStatus = -1; - if (originRefundStatus == 1) { - // 没有售后 - orderStatus = originOrderStatus; - if(originOrderStatus==1) { - platformStatusDesc = "待发货"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收"; - } - refundStatus = 1; - } else { - if (originRefundStatus == 4) { - refundStatus = 4; - orderStatus = EnumOOrderStatus.CLOSED.getIndex(); - if(originOrderStatus==1) { - platformStatusDesc = "待发货-已退款"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收-已退款"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收-已退款"; - } - } else { - refundStatus = originRefundStatus; - orderStatus = EnumOOrderStatus.REFUND.getIndex(); - if(originOrderStatus==1) { - platformStatusDesc = "待发货-售后中"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收-售后中"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收-售后中"; - } - } - } - if(orderDetail.getInteger("riskControlStatus")==1){ - orderStatus = 0; - } - insert.setRefundStatus(refundStatus); - insert.setOrderStatus(orderStatus); -// insert.setPlatformStatusCode(originOrderStatus+"-"+originRefundStatus); -// insert.setPlatformStatusDesc(platformStatusDesc); - // 价格 - insert.setGoodsAmount(orderDetail.getDouble("goodsAmount"));//.getGoodsAmount()); - insert.setPostFee(orderDetail.getDouble("postage")); - insert.setAmount(orderDetail.getDouble("goodsAmount")); - double payAmount = orderDetail.getDouble("payAmount"); - insert.setPayment(payAmount); - double platformDiscount = orderDetail.getDouble("platformDiscount")!=null?orderDetail.getDouble("platformDiscount"):0.0; - insert.setPlatformDiscount(platformDiscount); - double sellerDiscount = orderDetail.getDouble("sellerDiscount")!=null?orderDetail.getDouble("sellerDiscount"):0.0; - insert.setSellerDiscount(sellerDiscount); - double payDiscount = orderDetail.getDouble("duoDuoPayReduction")!=null?orderDetail.getDouble("duoDuoPayReduction"):0.0; -// insert.setMerchantAmount(payAmount+platformDiscount+payDiscount); -// insert.setWaybillCode(orderDetail.getString("trackingNumber")); - insert.setReceiverName(orderDetail.getString("receiverNameMask")); - insert.setReceiverMobile(orderDetail.getString("receiverPhoneMask")); - insert.setAddress(orderDetail.getString("addressMask")); - insert.setProvince(orderDetail.getString("province")); - insert.setCity(orderDetail.getString("city")); - insert.setTown(orderDetail.getString("town")); - - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime dateTime = LocalDateTime.parse(orderDetail.getString("createdTime"), formatter); - insert.setOrderTime(dateTime); -// insert.setOrderModifiedTime(orderDetail.getString("updatedAt")); -// if(orderDetail.getDate("receiveTime")!=null){ -// insert.setOrderFinishTime(orderDetail.getDate("receiveTime").getTime()); -// } -// insert.setShipType(0); - insert.setCreateTime(new Date()); - insert.setCreateBy("ORDER_MESSAGE"); - -// insert.setOpenAddressId(orderDetail.getString("openAddressId")); - orderMapper.insert(insert); - // 发送新订单消息 -// sseService.broadcastNewOrderMessage(EnumShopType.PDD,insert.getOrderNum()); - // 插入orderItem -// addPddOrderItem(insert.getId(),originOrder.getOrderSn(),orderStatus,refundStatus,platformDiscount,sellerDiscount); -// JSONArray itemArray = orderDetail.getJSONArray("items"); -// if (itemArray.isEmpty()) { -// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); -// log.info("=====pdd order message===没有items====事务回滚======="); -// } - - - for (int i =0;i itemObject = (Map) itemArray.get(i); -// JSONObject itemObject = (JSONObject) item; - - OOrderItem orderItem = new OOrderItem(); - orderItem.setShopId(insert.getShopId()); - orderItem.setShopType(EnumShopType.PDD.getIndex()); -// orderItem.setMerchantId(insert.getMerchantId()); -// orderItem.setOrderTime(insert.getOrderTime()); - orderItem.setOrderId(insert.getId()); - orderItem.setOrderNum(orderSn); - orderItem.setSubOrderNum(orderSn+"-"+itemObject.getString("skuId")); - // 这里将订单商品skuid转换成erp系统的skuid -// Long erpGoodsId = 0L; -// String erpSkuId = "0"; -// -// List pddGoodsSku = pddGoodsSkuMapper.selectList(new LambdaQueryWrapper().eq(PddGoodsSku::getSkuId, item.getSkuId())); -// if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { -// erpGoodsId = pddGoodsSku.get(0).getOGoodsId(); -// erpSkuId = pddGoodsSku.get(0).getOGoodsSkuId(); -//// orderItem.setGoodsImg(taoGoodsSku.get(0).getLogo()); -//// orderItem.setGoodsSpec(jdGoodsSkus.get(0).getSkuName()); -//// orderItem.setSkuNum(taoGoodsSku.get(0).getOuterId()); -// } - orderItem.setSkuNum(itemObject.getString("outerId")); - orderItem.setSkuId(itemObject.getString("skuId")); -// orderItem.setProductId(itemObject.getString("goodsId")); - orderItem.setGoodsId(itemObject.getLong("erpGoodsId")); - orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId")); - orderItem.setGoodsImg(itemObject.getString("goodsImg")); - orderItem.setGoodsSpec(itemObject.getString("goodsSpec")); - orderItem.setGoodsTitle(itemObject.getString("goodsName")); - orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice")); - orderItem.setQuantity(itemObject.getInteger("goodsCount")); - if (i == 0) { - Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - insert.getPlatformDiscount() - insert.getSellerDiscount(); - orderItem.setItemAmount(itemAmount); - orderItem.setPayment(itemAmount); - } else { - orderItem.setItemAmount(orderItem.getGoodsPrice()* orderItem.getQuantity()); - orderItem.setPayment(orderItem.getGoodsPrice()* orderItem.getQuantity()); - } -// orderItem.setPayment(item.getGoodsPrice()); - -// orderItem.setOrderStatus(orderStatus); - orderItem.setRefundStatus(refundStatus); - orderItem.setRefundCount(0); - orderItem.setCreateTime(new Date()); - orderItem.setCreateBy("ORDER_MESSAGE"); - orderItemMapper.insert(orderItem); - } - - - }else { - // 修改订单 (修改：) - OOrder update = new OOrder(); - update.setId(oOrders.get(0).getId()); - Integer originOrderStatus = orderDetail.getInteger("orderStatus"); - Integer originRefundStatus = orderDetail.getInteger("refundStatus"); - Integer afterSalesStatus = orderDetail.getInteger("afterSalesStatus"); - String platformStatusDesc = "未知"; - // 状态 订单状态0：新订单，1：待发货，2：已发货，3：已完成，11已取消；12退款中；21待付款；22锁定，29删除 - int orderStatus = 0; - int refundStatus = -1; - if (originRefundStatus == 1) { - // 没有售后 - orderStatus = originOrderStatus; - if(originOrderStatus==1) { - platformStatusDesc = "待发货"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收"; - } - refundStatus = 1; - } else { - if (originRefundStatus == 4) { - refundStatus = 4; - orderStatus = EnumOOrderStatus.CLOSED.getIndex(); - if(originOrderStatus==1) { - platformStatusDesc = "待发货-已退款"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收-已退款"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收-已退款"; - } - } else { - refundStatus = originRefundStatus; - orderStatus = EnumOOrderStatus.REFUND.getIndex(); - if(originOrderStatus==1) { - platformStatusDesc = "待发货-售后中"; - }else if(originOrderStatus == 2){ - platformStatusDesc = "已发货待签收-售后中"; - }else if(originOrderStatus == 3){ - platformStatusDesc = "已签收-售后中"; - } - } - } - if(orderDetail.getInteger("riskControlStatus")==1){ - orderStatus = 0; - } -// insert.setRefundStatus(refundStatus); - update.setOrderStatus(orderStatus); -// update.setPlatformStatusCode(originOrderStatus+"-"+originRefundStatus); -// update.setPlatformStatusDesc(platformStatusDesc); - update.setShopType(EnumShopType.PDD.getIndex()); - update.setShopId(orderDetail.getLong("shopId")); -// update.setMerchantId(orderDetail.getLong("merchantId")); - - // 价格 - update.setGoodsAmount(orderDetail.getDouble("goodsAmount"));//.getGoodsAmount()); - update.setPostFee(orderDetail.getDouble("postage")); - update.setAmount(orderDetail.getDouble("goodsAmount")); - double payAmount = orderDetail.getDouble("payAmount"); - update.setPayment(payAmount); - double platformDiscount = orderDetail.getDouble("platformDiscount")!=null?orderDetail.getDouble("platformDiscount"):0.0; - update.setPlatformDiscount(platformDiscount); - double sellerDiscount = orderDetail.getDouble("sellerDiscount")!=null?orderDetail.getDouble("sellerDiscount"):0.0; - update.setSellerDiscount(sellerDiscount); - double payDiscount = orderDetail.getDouble("duoDuoPayReduction")!=null?orderDetail.getDouble("duoDuoPayReduction"):0.0; -// update.setMerchantAmount(payAmount+platformDiscount+payDiscount); - - if (orderStatus == 1 && refundStatus == 1) { - if (StringUtils.isNotBlank(orderDetail.getString("receiverNameMask"))) { - update.setReceiverName(orderDetail.getString("receiverNameMask")); - } - if (StringUtils.isNotBlank(orderDetail.getString("receiverPhoneMask"))) { - update.setReceiverMobile(orderDetail.getString("receiverPhoneMask")); - } - if (StringUtils.isNotBlank(orderDetail.getString("addressMask"))) { - update.setAddress(orderDetail.getString("addressMask")); - } - } - - if (StringUtils.isNotBlank(orderDetail.getString("province"))) { - update.setProvince(orderDetail.getString("province")); - } - if (StringUtils.isNotBlank(orderDetail.getString("city"))) { - update.setCity(orderDetail.getString("city")); - } - if (StringUtils.isNotBlank(orderDetail.getString("town"))) { - update.setTown(orderDetail.getString("town")); - } - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - LocalDateTime dateTime = LocalDateTime.parse(orderDetail.getString("createdTime"), formatter); - update.setOrderTime(dateTime); -// update.setOrderModifiedTime(orderDetail.getString("updatedAt")); -// if(orderDetail.getDate("receiveTime")!=null){ -// update.setOrderFinishTime(orderDetail.getDate("receiveTime").getTime()); -// } -// update.setOpenAddressId(orderDetail.getString("openAddressId")); -// update.setWaybillCode(orderDetail.getString("trackingNumber")); - update.setUpdateTime(new Date()); - update.setUpdateBy("ORDER_MESSAGE"); - orderMapper.updateById(update); - // 更新发货主表数据状态 - - - - Long shipOrderId = 0L; - for (int i = 0; i < itemArray.size(); i++) { - JSONObject itemObject = itemArray.getJSONObject(i); - List oOrderItems = orderItemMapper.selectList( - new LambdaQueryWrapper().eq(OOrderItem::getOrderId, oOrders.get(0).getId()) - .eq(OOrderItem::getSkuId, itemObject.getString("skuId"))); - if (oOrderItems.isEmpty()) { - // 新增item - OOrderItem orderItem = new OOrderItem(); - orderItem.setOrderId(oOrders.get(0).getId()); - orderItem.setShopId(update.getShopId()); - orderItem.setShopType(EnumShopType.PDD.getIndex()); -// orderItem.setMerchantId(update.getMerchantId()); - orderItem.setOrderNum(orderSn); - orderItem.setSubOrderNum(orderSn + "-" + itemObject.getString("skuId")); - orderItem.setSkuNum(itemObject.getString("outerId")); - orderItem.setSkuId(itemObject.getString("skuId")); -// orderItem.setProductId(itemObject.getString("goodsId")); - orderItem.setGoodsId(itemObject.getLong("erpGoodsId")); - orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId")); - orderItem.setGoodsImg(itemObject.getString("goodsImg")); - orderItem.setGoodsSpec(itemObject.getString("goodsSpec")); - orderItem.setGoodsTitle(itemObject.getString("goodsName")); - orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice")); - orderItem.setQuantity(itemObject.getInteger("goodsCount")); - if (i == 0) { - Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - oOrders.get(0).getPlatformDiscount() - oOrders.get(0).getSellerDiscount(); - orderItem.setItemAmount(itemAmount); - orderItem.setPayment(itemAmount); - } else { - orderItem.setItemAmount(orderItem.getGoodsPrice() * orderItem.getQuantity()); - orderItem.setPayment(orderItem.getGoodsPrice() * orderItem.getQuantity()); - } -// orderItem.setOrderStatus(orderStatus); - orderItem.setRefundStatus(refundStatus); - orderItem.setRefundCount(0); - orderItem.setCreateTime(new Date()); - orderItem.setCreateBy("ORDER_MESSAGE"); - orderItemMapper.insert(orderItem); - } else { - // 修改、 - OOrderItem orderItem = new OOrderItem(); - orderItem.setId(oOrderItems.get(0).getId()); - orderItem.setShopId(update.getShopId()); - orderItem.setShopType(EnumShopType.PDD.getIndex()); - orderItem.setSkuNum(itemObject.getString("outerId")); - orderItem.setSkuId(itemObject.getString("skuId")); - orderItem.setGoodsId(itemObject.getLong("erpGoodsId")); - orderItem.setGoodsSkuId(itemObject.getLong("erpGoodsSkuId")); - orderItem.setGoodsImg(itemObject.getString("goodsImg")); - orderItem.setGoodsSpec(itemObject.getString("goodsSpec")); - orderItem.setGoodsTitle(itemObject.getString("goodsName")); - orderItem.setGoodsPrice(itemObject.getDouble("goodsPrice")); - orderItem.setQuantity(itemObject.getInteger("goodsCount")); - if (i == 0) { - Double itemAmount = orderItem.getGoodsPrice() * orderItem.getQuantity() - oOrders.get(0).getPlatformDiscount() - oOrders.get(0).getSellerDiscount(); - orderItem.setItemAmount(itemAmount); - orderItem.setPayment(itemAmount); - } else { - orderItem.setItemAmount(orderItem.getGoodsPrice() * orderItem.getQuantity()); - orderItem.setPayment(orderItem.getGoodsPrice() * orderItem.getQuantity()); - } -// orderItem.setOrderStatus(orderStatus); - orderItem.setRefundStatus(refundStatus); - orderItem.setRefundCount(0); - orderItem.setUpdateTime(new Date()); - orderItem.setUpdateBy("ORDER_MESSAGE"); - orderItemMapper.updateById(orderItem); - } - } - - // 更新主订单状态（如果全部退款的话，就更新成订单取消状态） - List oOrderItems = orderItemMapper.selectList(new LambdaQueryWrapper() - .eq(OOrderItem::getOrderId, update.getId()) - .eq(OOrderItem::getRefundStatus, 1) - ); - // 找出没有退款的子订单，如果没有，那么把主订单直接更新成取消状态 - if (oOrderItems == null || oOrderItems.isEmpty()) { - OOrder orderUpdate = new OOrder(); - orderUpdate.setId(update.getId()); - orderUpdate.setOrderStatus(EnumOOrderStatus.CLOSED.getIndex()); - orderUpdate.setCancelReason("子订单全部退款"); - orderUpdate.setUpdateBy("子订单全部退款"); - orderUpdate.setUpdateTime(new Date()); - orderMapper.updateById(orderUpdate); - } - log.info("===========同步pddOrder====成功"); - } - return ResultVo.success(); - } -} diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java index a92c4046..05609736 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; -import cn.qihangerp.module.goods.mapper.OGoodsMapper; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.mapper.OGoodsInventoryMapper; +import cn.qihangerp.mapper.OGoodsMapper; +import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.model.bo.PddGoodsBo; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java index c903a8bc..37137fee 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java @@ -194,11 +194,7 @@ public class PddOrderServiceImpl extends ServiceImpl // 添加item for (var item : order.getItems()) { - List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(PddGoodsSku::getSkuId, item.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString()); - item.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId().toString()); - } + item.setOrderSn(order.getOrderSn()); itemMapper.insert(item); } @@ -210,11 +206,6 @@ public class PddOrderServiceImpl extends ServiceImpl mapper.insert(order); // 添加item for (var item : order.getItems()) { - List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(PddGoodsSku::getSkuId, item.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setOGoodsId(pddGoodsSku.get(0).getErpGoodsId().toString()); - item.setOGoodsSkuId(pddGoodsSku.get(0).getErpGoodsSkuId().toString()); - } item.setOrderSn(order.getOrderSn()); itemMapper.insert(item); } @@ -262,14 +253,15 @@ public class PddOrderServiceImpl extends ServiceImpl order.setShipType(0); order.setBuyerMemo(pddOrder.getBuyerMemo()); order.setSellerMemo(pddOrder.getRemark()); - order.setRefundStatus(1); - order.setOrderStatus(1); + order.setGoodsAmount(pddOrder.getGoodsAmount()!=null?pddOrder.getGoodsAmount():0.0); order.setPostFee(pddOrder.getPostage()!=null?pddOrder.getPostage():0.0); order.setSellerDiscount(pddOrder.getSellerDiscount()!=null?pddOrder.getSellerDiscount():0.0); order.setPlatformDiscount(pddOrder.getPlatformDiscount()!=null?pddOrder.getPlatformDiscount():0.0); order.setAmount(pddOrder.getPayAmount()!=null?pddOrder.getPayAmount():0.0); order.setPayment(pddOrder.getPayAmount()!=null?pddOrder.getPayAmount():0.0); + order.setPayDiscount(0.0); + order.setChangeAmount(pddOrder.getOrderChangeAmount()); order.setReceiverName(confirmBo.getReceiver()); order.setReceiverMobile(confirmBo.getMobile()); order.setAddress(confirmBo.getAddress()); @@ -278,10 +270,18 @@ public class PddOrderServiceImpl extends ServiceImpl order.setTown(confirmBo.getTown()); // 定义日期时间格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 将字符串转换为LocalDateTime - LocalDateTime orderTime = LocalDateTime.parse(pddOrder.getCreatedTime(), formatter); + order.setOrderCreateTime(StringUtils.hasText(pddOrder.getCreatedTime())?LocalDateTime.parse(pddOrder.getCreatedTime(), formatter):LocalDateTime.now()); + order.setOrderUpdateTime(StringUtils.hasText(pddOrder.getUpdatedAt())?LocalDateTime.parse(pddOrder.getUpdatedAt(), formatter):LocalDateTime.now()); + order.setOrderFinishTime(StringUtils.hasText(pddOrder.getReceiveTime())?LocalDateTime.parse(pddOrder.getReceiveTime(), formatter):null); + order.setOrderStatus(pddOrder.getOrderStatus().toString()); + if(pddOrder.getOrderStatus().intValue() ==1){ + order.setOrderStatusText("待发货"); + }else if(pddOrder.getOrderStatus().intValue() ==2){ + order.setOrderStatusText("已发货待签收"); + }else if(pddOrder.getOrderStatus().intValue() ==3){ + order.setOrderStatusText("已签收"); + } - order.setOrderTime(StringUtils.hasText(pddOrder.getCreatedTime())?orderTime:LocalDateTime.now()); order.setShipper(0L); order.setShipStatus(0); order.setCreateTime(new Date()); @@ -290,14 +290,22 @@ public class PddOrderServiceImpl extends ServiceImpl //插入item for (var item : pddOrderItems) { OOrderItem oOrderItem = new OOrderItem(); + List skus = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(PddGoodsSku::getSkuId, item.getSkuId())); + if (skus != null && !skus.isEmpty()) { + oOrderItem.setGoodsId(skus.get(0).getErpGoodsId()); + oOrderItem.setGoodsSkuId(skus.get(0).getErpGoodsSkuId()); + }else { + return ResultVo.error("店铺商品找不到绑定的商品库商品"); + } + oOrderItem.setOrderId(order.getId()); oOrderItem.setOrderNum(pddOrder.getOrderSn()); oOrderItem.setSubOrderNum(pddOrder.getOrderSn()+"-"+item.getSkuId()); oOrderItem.setShopType(EnumShopType.PDD.getIndex()); oOrderItem.setShopId(pddOrder.getShopId()); + // 商品信息 + oOrderItem.setProductId(item.getGoodsId().toString()); oOrderItem.setSkuId(item.getSkuId().toString()); - oOrderItem.setGoodsId(StringUtils.hasText(item.getOGoodsId())?Long.parseLong(item.getOGoodsId()):0L); - oOrderItem.setGoodsSkuId(StringUtils.hasText(item.getOGoodsSkuId())?Long.parseLong(item.getOGoodsSkuId()):0L); oOrderItem.setGoodsTitle(item.getGoodsName()); oOrderItem.setGoodsImg(item.getGoodsImg()); oOrderItem.setGoodsNum(item.getOuterGoodsId()); @@ -305,12 +313,23 @@ public class PddOrderServiceImpl extends ServiceImpl oOrderItem.setSkuNum(item.getOuterId()); oOrderItem.setGoodsPrice(item.getGoodsPrice()!=null?item.getGoodsPrice():0.0); oOrderItem.setQuantity(item.getGoodsCount()); - oOrderItem.setItemAmount(oOrderItem.getGoodsPrice()*oOrderItem.getQuantity()); - oOrderItem.setDiscountAmount(0.0); - oOrderItem.setPayment(0.0); - oOrderItem.setRefundCount(0); - oOrderItem.setRefundStatus(1); + // 价格信息 + Double goodsAmount = item.getGoodsPrice() * item.getGoodsCount(); + oOrderItem.setGoodsAmount(goodsAmount); + oOrderItem.setItemAmount(pddOrder.getPayAmount()); + oOrderItem.setSellerDiscount(pddOrder.getSellerDiscount()); + oOrderItem.setPlatformDiscount(pddOrder.getPlatformDiscount()); + oOrderItem.setPayDiscount(0.0); + oOrderItem.setChangeAmount(pddOrder.getOrderChangeAmount()); + oOrderItem.setPayment(pddOrder.getPayAmount()); + if(pddOrder.getRefundStatus().intValue()==1) { + oOrderItem.setRefundCount(0); + oOrderItem.setRefundStatus(1); + }else{ + oOrderItem.setRefundStatus(pddOrder.getRefundStatus()); + oOrderItem.setRefundCount(item.getGoodsCount()); + } oOrderItem.setShipper(0l); oOrderItem.setShipType(order.getShipType()); oOrderItem.setShipStatus(0); diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index 1db7158e..26cdce3b 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -17,7 +17,7 @@ sys goods - order + wei stock diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java index be5be911..5672de71 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; -import cn.qihangerp.module.goods.mapper.OGoodsMapper; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.mapper.OGoodsInventoryMapper; +import cn.qihangerp.mapper.OGoodsMapper; +import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.TaoGoods; import cn.qihangerp.model.entity.TaoGoodsSku; import cn.qihangerp.model.bo.TaoGoodsBo; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java index 857d7e9a..5eda35fc 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java @@ -8,9 +8,9 @@ import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; -import cn.qihangerp.module.goods.mapper.OGoodsMapper; -import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.mapper.OGoodsInventoryMapper; +import cn.qihangerp.mapper.OGoodsMapper; +import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.WeiGoods; import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper;