From 194fcb902eb0d4682359ff840b2abb6f6ac40bc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Wed, 31 Dec 2025 12:06:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B0=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 27 +++++++++++------- .../erp/controller/ReportController.java | 4 +-- .../erp/controller/StockInController.java | 6 ++-- .../erp/controller/StockOutController.java | 4 +-- .../erp/controller/WarehouseController.java | 4 +-- .../cn/qihangerp/model}/bo/JdAfterBo.java | 2 +- .../cn/qihangerp/model}/bo/JdGoodsBo.java | 2 +- .../cn/qihangerp/model}/bo/JdOrderBo.java | 2 +- .../cn/qihangerp/model}/bo/JdOrderPushBo.java | 2 +- .../qihangerp/model}/bo/JdTokenCreateBo.java | 2 +- .../model}/bo/OfflineOrderCreateBo.java | 2 +- .../model}/bo/OfflineOrderCreateItemBo.java | 2 +- .../model}/bo/OfflineOrderPushBo.java | 2 +- .../model}/bo/OfflineOrderShipBo.java | 2 +- .../model}/bo/OrderAllocateShipRequest.java | 2 +- .../cn/qihangerp/model}/bo/OrderCreateBo.java | 2 +- .../model}/bo/OrderCreateItemBo.java | 2 +- .../qihangerp/model}/bo/OrderItemListBo.java | 3 +- .../cn/qihangerp/model}/bo/OrderSearchBo.java | 2 +- .../cn/qihangerp/model}/bo/OrderShipBo.java | 2 +- .../qihangerp/model}/bo/OrderShipRequest.java | 2 +- .../qihangerp/model}/bo/OrderShipSendBo.java | 2 +- .../model}/bo/RefundProcessingBo.java | 2 +- .../qihangerp/model}/bo/RefundSearchBo.java | 2 +- .../cn/qihangerp/model}/bo/ShipStockUpBo.java | 2 +- .../model}/bo/ShipStockUpCompleteBo.java | 2 +- .../cn/qihangerp/model}/bo/ShipWaybillBo.java | 2 +- .../model}/bo/SupplierOrderShipBo.java | 2 +- .../cn/qihangerp/model}/bo/TaoGoodsBo.java | 2 +- .../cn/qihangerp/model}/bo/TaoOrderBo.java | 2 +- .../model}/bo/TaoOrderConfirmBo.java | 2 +- .../qihangerp/model}/bo/TaoOrderPushBo.java | 2 +- .../qihangerp/model}/bo/TaoOrderShipBo.java | 2 +- .../cn/qihangerp/model}/bo/TaoRefundBo.java | 2 +- .../qihangerp/model}/bo/TaoTokenSaveBo.java | 2 +- .../model}/bo/WeiOrderConfirmBo.java | 2 +- .../qihangerp/model}/bo/WeiOrderPushBo.java | 2 +- .../qihangerp/model/entity}/ErpStockIn.java | 2 +- .../model/entity}/ErpStockInItem.java | 2 +- .../entity}/ErpStockOutItemPosition.java | 2 +- .../qihangerp/model/entity}/ErpWarehouse.java | 2 +- .../model/entity}/ErpWarehousePosition.java | 2 +- .../cn/qihangerp/model/entity}/JdGoods.java | 2 +- .../qihangerp/model/entity}/JdGoodsSku.java | 2 +- .../cn/qihangerp/model/entity}/JdOrder.java | 2 +- .../model/entity}/JdOrderCoupon.java | 2 +- .../qihangerp/model/entity}/JdOrderItem.java | 2 +- .../cn/qihangerp/model/entity}/JdRefund.java | 2 +- .../qihangerp/model/entity}/OAfterSale.java | 2 +- .../model/entity}/OOrderShipList.java | 2 +- .../model/entity}/OOrderShipListItem.java | 2 +- .../qihangerp/model/entity}/OShipWaybill.java | 2 +- .../cn/qihangerp/model/entity}/OShipment.java | 2 +- .../model/entity}/OShipmentItem.java | 2 +- .../model/entity}/OfflineGoodsSku.java | 2 +- .../qihangerp/model/entity}/OfflineOrder.java | 2 +- .../model/entity}/OfflineOrderItem.java | 2 +- .../model/entity}/OfflineRefund.java | 2 +- .../cn/qihangerp/model/entity}/TaoGoods.java | 2 +- .../qihangerp/model/entity}/TaoGoodsSku.java | 2 +- .../cn/qihangerp/model/entity}/TaoOrder.java | 2 +- .../qihangerp/model/entity}/TaoOrderItem.java | 2 +- .../model/entity}/TaoOrderPromotion.java | 2 +- .../cn/qihangerp/model/entity}/TaoRefund.java | 2 +- .../cn/qihangerp/model/entity}/WeiGoods.java | 2 +- .../qihangerp/model/entity}/WeiGoodsSku.java | 2 +- .../cn/qihangerp/model/entity}/WeiOrder.java | 2 +- .../qihangerp/model/entity}/WeiOrderItem.java | 2 +- .../cn/qihangerp/model/entity}/WeiRefund.java | 2 +- .../model/entity}/WeiWaybillAccount.java | 2 +- .../model/entity}/WmsInventoryOperation.java | 2 +- .../model}/request/GoodsSkuInventoryVo.java | 2 +- .../model}/request/StockInCreateItem.java | 2 +- .../model}/request/StockInCreateRequest.java | 2 +- .../qihangerp/model}/request/StockInItem.java | 2 +- .../model}/request/StockInRequest.java | 2 +- .../model}/request/StockOutCreateRequest.java | 2 +- .../model}/request/StockOutItemRequest.java | 2 +- .../qihangerp/model}/vo/JdGoodsSkuListVo.java | 4 +-- .../cn/qihangerp/model}/vo/SalesDailyVo.java | 2 +- .../cn/qihangerp/model}/vo/SalesTopSkuVo.java | 2 +- .../model}/vo/TaoGoodsSkuListVo.java | 5 ++-- docs/preview.png | Bin 159826 -> 210912 bytes .../jd/controller/JdGoodsApiController.java | 2 +- .../api/jd/controller/JdGoodsController.java | 6 ++-- .../api/jd/controller/JdOAuthController.java | 2 +- .../JdOrderAfterSaleApiController.java | 2 +- .../JdOrderAfterSaleController.java | 6 ++-- .../jd/controller/JdOrderApiController.java | 4 +-- .../api/jd/controller/JdOrderController.java | 6 ++-- .../feign/JdOrderFeignController.java | 2 +- .../feign/JdRefundFeignController.java | 2 +- .../AfterSaleProcessingController.java | 2 +- .../controller/OfflineGoodsController.java | 2 +- .../controller/OfflineOrderController.java | 4 +-- .../controller/OfflineShipController.java | 6 ++-- .../api/order/controller/OrderController.java | 4 +-- .../order/controller/OrderItemController.java | 2 +- .../order/controller/OrderShipController.java | 5 ++-- .../order/controller/RefundController.java | 4 +-- .../order/controller/ShipmentController.java | 4 +-- .../api/tao/OrderAssembleHelper.java | 4 +-- .../tao/controller/TaoGoodsApiController.java | 4 +-- .../tao/controller/TaoGoodsController.java | 6 ++-- .../tao/controller/TaoOAuthController.java | 2 +- .../tao/controller/TaoOrderApiController.java | 3 +- .../tao/controller/TaoOrderController.java | 9 +++--- .../controller/TaoRefundApiController.java | 2 +- .../tao/controller/TaoRefundController.java | 6 ++-- .../api/tao/controller/TaoShipController.java | 2 +- .../feign/TaoOrderFeignController.java | 2 +- .../feign/TaoRefundFeignController.java | 2 +- .../wei/controller/GoodsApiController.java | 4 +-- .../wei/controller/WeiGoodsController.java | 4 +-- .../wei/controller/WeiOrderApiController.java | 4 +-- .../wei/controller/WeiOrderController.java | 6 ++-- .../controller/WeiRefundApiController.java | 2 +- .../wei/controller/WeiRefundController.java | 4 +-- .../feign/WeiOrderFeignController.java | 2 +- .../feign/WeiRefundFeignController.java | 2 +- .../module/open/jd/mapper/JdGoodsMapper.java | 4 +-- .../open/jd/mapper/JdGoodsSkuMapper.java | 6 ++-- .../open/jd/mapper/JdOrderCouponMapper.java | 2 +- .../open/jd/mapper/JdOrderItemMapper.java | 4 +-- .../module/open/jd/mapper/JdOrderMapper.java | 2 +- .../module/open/jd/mapper/JdRefundMapper.java | 2 +- .../open/jd/service/JdGoodsService.java | 6 ++-- .../open/jd/service/JdGoodsSkuService.java | 4 +-- .../open/jd/service/JdOrderCouponService.java | 2 +- .../open/jd/service/JdOrderItemService.java | 2 +- .../open/jd/service/JdOrderService.java | 4 +-- .../open/jd/service/JdRefundService.java | 4 +-- .../jd/service/impl/JdGoodsServiceImpl.java | 6 ++-- .../service/impl/JdGoodsSkuServiceImpl.java | 6 ++-- .../impl/JdOrderCouponServiceImpl.java | 2 +- .../service/impl/JdOrderItemServiceImpl.java | 2 +- .../jd/service/impl/JdOrderServiceImpl.java | 10 +++---- .../jd/service/impl/JdRefundServiceImpl.java | 6 ++-- .../resources/mapper/jd/JdGoodsMapper.xml | 2 +- .../resources/mapper/jd/JdGoodsSkuMapper.xml | 4 +-- .../mapper/jd/JdOrderCouponMapper.xml | 2 +- .../resources/mapper/jd/JdOrderItemMapper.xml | 2 +- .../resources/mapper/jd/JdOrderMapper.xml | 2 +- .../resources/mapper/jd/JdRefundMapper.xml | 2 +- .../module/order/mapper/OAfterSaleMapper.java | 4 +-- .../module/order/mapper/OOrderItemMapper.java | 4 +-- .../module/order/mapper/OOrderMapper.java | 2 +- .../mapper/OOrderShipListItemMapper.java | 4 +-- .../order/mapper/OOrderShipListMapper.java | 4 +-- .../order/mapper/OShipWaybillMapper.java | 4 +-- .../order/mapper/OShipmentItemMapper.java | 4 +-- .../module/order/mapper/OShipmentMapper.java | 4 +-- .../order/mapper/OfflineGoodsSkuMapper.java | 4 +-- .../order/mapper/OfflineOrderItemMapper.java | 4 +-- .../order/mapper/OfflineOrderMapper.java | 4 +-- .../order/mapper/OfflineRefundMapper.java | 4 +-- .../order/service/ErpShipmentItemService.java | 2 +- .../order/service/ErpShipmentService.java | 4 +-- .../order/service/OAfterSaleService.java | 2 +- .../order/service/OOrderItemService.java | 4 +-- .../module/order/service/OOrderService.java | 6 ++-- .../service/OOrderShipListItemService.java | 4 +-- .../order/service/OOrderShipListService.java | 7 ++--- .../module/order/service/ORefundService.java | 4 +-- .../order/service/OShipWaybillService.java | 2 +- .../order/service/OfflineGoodsSkuService.java | 2 +- .../service/OfflineOrderItemService.java | 2 +- .../order/service/OfflineOrderService.java | 6 ++-- .../order/service/OfflineRefundService.java | 2 +- .../impl/ErpShipmentItemServiceImpl.java | 2 +- .../service/impl/ErpShipmentServiceImpl.java | 6 ++-- .../service/impl/OAfterSaleServiceImpl.java | 2 +- .../service/impl/OOrderItemServiceImpl.java | 4 +-- .../order/service/impl/OOrderServiceImpl.java | 7 ++--- .../impl/OOrderShipListItemServiceImpl.java | 4 +-- .../impl/OOrderShipListServiceImpl.java | 11 +++---- .../service/impl/ORefundServiceImpl.java | 6 ++-- .../service/impl/OShipWaybillServiceImpl.java | 2 +- .../impl/OfflineGoodsSkuServiceImpl.java | 2 +- .../impl/OfflineOrderItemServiceImpl.java | 2 +- .../service/impl/OfflineOrderServiceImpl.java | 10 +++---- .../impl/OfflineRefundServiceImpl.java | 2 +- .../resources/mapper/OAfterSaleMapper.xml | 2 +- .../resources/mapper/OOrderItemMapper.xml | 4 +-- .../main/resources/mapper/OOrderMapper.xml | 4 +-- .../mapper/OOrderShipListItemMapper.xml | 2 +- .../resources/mapper/OOrderShipListMapper.xml | 2 +- .../resources/mapper/OShipWaybillMapper.xml | 2 +- .../resources/mapper/OShipmentItemMapper.xml | 2 +- .../main/resources/mapper/OShipmentMapper.xml | 2 +- .../mapper/OfflineGoodsSkuMapper.xml | 2 +- .../mapper/OfflineOrderItemMapper.xml | 2 +- .../resources/mapper/OfflineOrderMapper.xml | 2 +- .../resources/mapper/OfflineRefundMapper.xml | 2 +- .../stock/mapper/ErpStockInItemMapper.java | 2 +- .../module/stock/mapper/ErpStockInMapper.java | 2 +- .../mapper/ErpStockOutItemPositionMapper.java | 2 +- .../stock/mapper/ErpWarehouseMapper.java | 2 +- .../mapper/ErpWarehousePositionMapper.java | 2 +- .../mapper/WmsInventoryOperationMapper.java | 2 +- .../service/ErpInventoryOperationService.java | 2 +- .../stock/service/ErpStockInItemService.java | 2 +- .../stock/service/ErpStockInService.java | 6 ++-- .../ErpStockOutItemPositionService.java | 2 +- .../stock/service/ErpStockOutService.java | 4 +-- .../service/ErpWarehousePositionService.java | 2 +- .../stock/service/ErpWarehouseService.java | 2 +- .../ErpInventoryOperationServiceImpl.java | 2 +- .../impl/ErpStockInItemServiceImpl.java | 2 +- .../service/impl/ErpStockInServiceImpl.java | 12 ++++---- .../ErpStockOutItemPositionServiceImpl.java | 2 +- .../service/impl/ErpStockOutServiceImpl.java | 8 +++--- .../impl/ErpWarehousePositionServiceImpl.java | 2 +- .../service/impl/ErpWarehouseServiceImpl.java | 2 +- .../resources/mapper/ErpStockInItemMapper.xml | 2 +- .../resources/mapper/ErpStockInMapper.xml | 2 +- .../mapper/ErpStockOutItemPositionMapper.xml | 2 +- .../resources/mapper/ErpWarehouseMapper.xml | 2 +- .../mapper/ErpWarehousePositionMapper.xml | 2 +- .../mapper/WmsInventoryOperationMapper.xml | 2 +- .../open/tao/mapper/TaoGoodsMapper.java | 4 +-- .../open/tao/mapper/TaoGoodsSkuMapper.java | 4 +-- .../open/tao/mapper/TaoOrderItemMapper.java | 2 +- .../open/tao/mapper/TaoOrderMapper.java | 2 +- .../tao/mapper/TaoOrderPromotionMapper.java | 2 +- .../open/tao/mapper/TaoRefundMapper.java | 2 +- .../open/tao/service/TaoGoodsService.java | 4 +-- .../open/tao/service/TaoGoodsSkuService.java | 4 +-- .../open/tao/service/TaoOrderItemService.java | 2 +- .../tao/service/TaoOrderPromotionService.java | 2 +- .../open/tao/service/TaoOrderService.java | 7 ++--- .../open/tao/service/TaoRefundService.java | 4 +-- .../tao/service/impl/TaoGoodsServiceImpl.java | 6 ++-- .../service/impl/TaoGoodsSkuServiceImpl.java | 6 ++-- .../service/impl/TaoOrderItemServiceImpl.java | 2 +- .../impl/TaoOrderPromotionServiceImpl.java | 2 +- .../tao/service/impl/TaoOrderServiceImpl.java | 14 ++++----- .../service/impl/TaoRefundServiceImpl.java | 6 ++-- .../resources/mapper/tao/TaoGoodsMapper.xml | 2 +- .../mapper/tao/TaoGoodsSkuMapper.xml | 4 +-- .../mapper/tao/TaoOrderItemMapper.xml | 2 +- .../resources/mapper/tao/TaoOrderMapper.xml | 2 +- .../mapper/tao/TaoOrderPromotionMapper.xml | 2 +- .../resources/mapper/tao/TaoRefundMapper.xml | 2 +- .../open/wei/mapper/WeiGoodsMapper.java | 4 +-- .../open/wei/mapper/WeiGoodsSkuMapper.java | 4 +-- .../open/wei/mapper/WeiOrderItemMapper.java | 2 +- .../open/wei/mapper/WeiOrderMapper.java | 2 +- .../open/wei/mapper/WeiRefundMapper.java | 2 +- .../wei/mapper/WeiWaybillAccountMapper.java | 2 +- .../open/wei/service/WeiGoodsService.java | 3 +- .../open/wei/service/WeiGoodsSkuService.java | 2 +- .../open/wei/service/WeiOrderItemService.java | 2 +- .../open/wei/service/WeiOrderService.java | 4 +-- .../open/wei/service/WeiRefundService.java | 2 +- .../wei/service/WeiWaybillAccountService.java | 2 +- .../wei/service/impl/WeiGoodsServiceImpl.java | 4 +-- .../service/impl/WeiGoodsSkuServiceImpl.java | 4 +-- .../service/impl/WeiOrderItemServiceImpl.java | 2 +- .../wei/service/impl/WeiOrderServiceImpl.java | 9 +++--- .../service/impl/WeiRefundServiceImpl.java | 4 +-- .../impl/WeiWaybillAccountServiceImpl.java | 2 +- .../resources/mapper/wei/WeiGoodsMapper.xml | 2 +- .../mapper/wei/WeiGoodsSkuMapper.xml | 2 +- .../mapper/wei/WeiOrderItemMapper.xml | 2 +- .../resources/mapper/wei/WeiOrderMapper.xml | 2 +- .../resources/mapper/wei/WeiRefundMapper.xml | 2 +- .../mapper/wei/WeiWaybillAccountMapper.xml | 2 +- 268 files changed, 415 insertions(+), 425 deletions(-) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/bo/JdAfterBo.java (78%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/bo/JdGoodsBo.java (89%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/bo/JdOrderBo.java (86%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/bo/JdOrderPushBo.java (64%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/bo/JdTokenCreateBo.java (75%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OfflineOrderCreateBo.java (95%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OfflineOrderCreateItemBo.java (90%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OfflineOrderPushBo.java (66%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OfflineOrderShipBo.java (78%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderAllocateShipRequest.java (90%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderCreateBo.java (93%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderCreateItemBo.java (85%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderItemListBo.java (92%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderSearchBo.java (81%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderShipBo.java (90%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderShipRequest.java (92%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/OrderShipSendBo.java (67%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/RefundProcessingBo.java (90%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/RefundSearchBo.java (84%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/ShipStockUpBo.java (81%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/ShipStockUpCompleteBo.java (82%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/ShipWaybillBo.java (76%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/bo/SupplierOrderShipBo.java (82%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoGoodsBo.java (89%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoOrderBo.java (86%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoOrderConfirmBo.java (91%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoOrderPushBo.java (64%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoOrderShipBo.java (78%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoRefundBo.java (77%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/bo/TaoTokenSaveBo.java (74%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model}/bo/WeiOrderConfirmBo.java (91%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model}/bo/WeiOrderPushBo.java (64%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ErpStockIn.java (97%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ErpStockInItem.java (97%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ErpStockOutItemPosition.java (96%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ErpWarehouse.java (96%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/ErpWarehousePosition.java (96%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdGoods.java (98%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdGoodsSku.java (97%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdOrder.java (99%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdOrderCoupon.java (95%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdOrderItem.java (97%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model/entity}/JdRefund.java (99%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OAfterSale.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OOrderShipList.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OOrderShipListItem.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OShipWaybill.java (96%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OShipment.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OShipmentItem.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OfflineGoodsSku.java (97%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OfflineOrder.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OfflineOrderItem.java (98%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OfflineRefund.java (98%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoGoods.java (98%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoGoodsSku.java (98%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoOrder.java (99%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoOrderItem.java (99%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoOrderPromotion.java (97%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model/entity}/TaoRefund.java (99%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiGoods.java (97%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiGoodsSku.java (97%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiOrder.java (98%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiOrderItem.java (98%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiRefund.java (98%) rename {serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WeiWaybillAccount.java (98%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain => core/model/src/main/java/cn/qihangerp/model/entity}/WmsInventoryOperation.java (98%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/GoodsSkuInventoryVo.java (94%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockInCreateItem.java (85%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockInCreateRequest.java (87%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockInItem.java (79%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockInRequest.java (83%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockOutCreateRequest.java (86%) rename {serviceImpl/stock/src/main/java/cn/qihangerp/module/stock => core/model/src/main/java/cn/qihangerp/model}/request/StockOutItemRequest.java (86%) rename {serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain => core/model/src/main/java/cn/qihangerp/model}/vo/JdGoodsSkuListVo.java (53%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/vo/SalesDailyVo.java (75%) rename {serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain => core/model/src/main/java/cn/qihangerp/model}/vo/SalesTopSkuVo.java (71%) rename {serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain => core/model/src/main/java/cn/qihangerp/model}/vo/TaoGoodsSkuListVo.java (65%) diff --git a/README.md b/README.md index cd69eee8..e7984f02 100644 --- a/README.md +++ b/README.md @@ -1,26 +1,29 @@ -# 启航电商ERP系统-微服务版 +# 启航电商ERP系统 > **欢迎来到我们的开源项目！创新、协作、高质量的代码。您的Star🌟，是我们前进的动力！ 💪✨🏆** > **项目持续更新中，还有很多不足，请多包含！如有任何疑问请提交issuse！谢谢！ 💪✨🏆** +> **启航电商ERP系统3.0版本在原版本基础上新增自动任务拉取订单、订单自动导入订单库等重大升级，进一步提升了开箱即用的特性。** + ## 一、系统介绍 -启航电商ERP系统3.0版本在原版本基础上新增自动任务拉取订单、订单自动导入订单库等重大升级，进一步提升了开箱即用的特性。 + 启航电商ERP系统逐步演变成了一个完整的ERP，主体功能包括：采购管理、商品管理、店铺商品管理、订单库、店铺订单管理、发货管理（手动发货、电子面单发货、供应商发货）、售后管理、库存管理等。 -**商业版对接了外部云仓，可以直接将订单推送到云仓发货** +**商业版支持多商户、多供应商、多仓库独立操作业务，还对接了京东云仓可以直接将订单推送到京东云仓发货** -与此同时该系统会陆续增加供外部调用的API，以便开发者满足自己的个性化业务需求。 +该系统可作为自行开发电商系统的底座使用，教程及文档请阅读开源文档或者访问官网：qihangerp.cn -启航电商ERP系统支持：淘宝天猫、京东、拼多多、抖店、微信小店等平台，后续将继续对接其他电商平台。 +启航电商ERP系统支持：淘宝天猫、京东、拼多多、抖店、微信小店等平台，计划很快就会加上快手、小红书。 ![](docs/preview.png) #### 系统特点 -+ 1、启航电商ERP系统是一个专注核心订单业务处理并且又能快速方便扩展个性化需求的一个底座。 -+ 2、该系统适合想自研电商系统的企业快速构建业务。**系统并不适合小卖家，小卖家还是老老实实使用市面上流行的SAAS吧。** ++ 1、启航电商ERP系统开源版是一个专注核心订单业务处理并且又能快速方便扩展个性化需求开发的一个底座。（商业版是一个完整的产品） + ++ 2、该系统适合想自研电商系统的企业快速构建企业电商业务。**系统并不适合小卖家，小卖家还是老老实实使用市面上流行的SAAS吧。** + 3、使用启航电商ERP系统的前置条件是：**自行申请各电商开放平台的AppKey** [开放平台申请说明](https://mp.weixin.qq.com/s/KqyNlIVl43dTWicaAeLR1g) @@ -100,6 +103,7 @@ graph TD ``` ## 三、功能模块 + #### 1、商品库 + 商品库：管理商品库商品，提供手动录入、API接收功能，可以设置自己发货还是供应商发货（影响到后台分单逻辑，即时生效）。 + 店铺商品：店铺商品管理，店铺商品API拉取、店铺商品API更新（进行店铺商品与商品库商品关联，根据SKU编码关联）。 @@ -107,10 +111,11 @@ graph TD + 商品品牌管理 #### 2、采购管理 -+ 采购订单管理 -+ 采购入库管理 -+ 采购承运商 -+ 供应商管理 + ++ 采购单：采购单创建、审核等管理。 ++ 采购入库：采购物流、收货、生成入库单。 ++ 采购承运商：承运商管理。 ++ 供应商管理：管理供应商。 #### 3、订单管理 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 d64fc010..986fe165 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 @@ -3,8 +3,8 @@ package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.goods.service.OGoodsInventoryService; -import cn.qihangerp.module.order.domain.vo.SalesDailyVo; -import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; +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.OShopService; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java index cdf603c5..2aff635e 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockInController.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.stock.domain.ErpStockIn; -import cn.qihangerp.module.stock.request.StockInCreateRequest; -import cn.qihangerp.module.stock.request.StockInRequest; +import cn.qihangerp.model.entity.ErpStockIn; +import cn.qihangerp.model.request.StockInCreateRequest; +import cn.qihangerp.model.request.StockInRequest; import cn.qihangerp.module.stock.service.ErpStockInService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java index 42e35ebc..4f75e7e2 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/StockOutController.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.model.entity.ErpStockOut; -import cn.qihangerp.module.stock.request.StockOutCreateRequest; -import cn.qihangerp.module.stock.request.StockOutItemRequest; +import cn.qihangerp.model.request.StockOutCreateRequest; +import cn.qihangerp.model.request.StockOutItemRequest; import cn.qihangerp.module.stock.service.ErpStockOutService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java index 3bb10072..e63eab36 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/WarehouseController.java @@ -3,8 +3,8 @@ package cn.qihangerp.erp.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.stock.domain.ErpWarehouse; -import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.model.entity.ErpWarehouse; +import cn.qihangerp.model.entity.ErpWarehousePosition; import cn.qihangerp.module.stock.service.ErpWarehousePositionService; import cn.qihangerp.module.stock.service.ErpWarehouseService; import cn.qihangerp.security.common.BaseController; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/JdAfterBo.java similarity index 78% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/JdAfterBo.java index 8569b971..34752fa0 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/JdAfterBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/JdGoodsBo.java similarity index 89% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/JdGoodsBo.java index b6978206..d323b176 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/JdGoodsBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/JdOrderBo.java similarity index 86% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/JdOrderBo.java index 2c141bba..bdc9b074 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/JdOrderBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/JdOrderPushBo.java similarity index 64% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/JdOrderPushBo.java index ed1a6151..73f52107 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/JdOrderPushBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/JdTokenCreateBo.java similarity index 75% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/JdTokenCreateBo.java index f097e099..28980f00 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/JdTokenCreateBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateBo.java similarity index 95% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateBo.java index c7097eb2..007a8ff7 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateItemBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateItemBo.java similarity index 90% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateItemBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateItemBo.java index b7f36882..42fc6d0b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderCreateItemBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderCreateItemBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderPushBo.java similarity index 66% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderPushBo.java index be99e85d..8cb54266 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderPushBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderPushBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderShipBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderShipBo.java similarity index 78% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderShipBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderShipBo.java index 65502ea4..adc9c5e2 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OfflineOrderShipBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OfflineOrderShipBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderAllocateShipRequest.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderAllocateShipRequest.java similarity index 90% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderAllocateShipRequest.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderAllocateShipRequest.java index f5760c8b..d07ad767 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderAllocateShipRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderAllocateShipRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateBo.java similarity index 93% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateBo.java index 2c2378f1..91384183 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo;//package cn.qihangerp.oms.domain.bo; +package cn.qihangerp.model.bo;//package cn.qihangerp.oms.domain.bo; // //import lombok.Data; // diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateItemBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateItemBo.java similarity index 85% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateItemBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateItemBo.java index e2cdc9d5..307b3464 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderCreateItemBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderCreateItemBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo;//package cn.qihangerp.oms.domain.bo; +package cn.qihangerp.model.bo;//package cn.qihangerp.oms.domain.bo; // //import lombok.Data; // diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderItemListBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderItemListBo.java similarity index 92% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderItemListBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderItemListBo.java index b2d4a44b..268d9f3b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderItemListBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderItemListBo.java @@ -1,9 +1,8 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; import java.io.Serializable; -import java.util.Date; /** * 订单明细表 diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderSearchBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderSearchBo.java similarity index 81% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderSearchBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderSearchBo.java index 4f20ec9d..b2df0771 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderSearchBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderSearchBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo;//package cn.qihangerp.oms.domain.bo; +package cn.qihangerp.model.bo;//package cn.qihangerp.oms.domain.bo; // //import lombok.Data; // diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipBo.java similarity index 90% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderShipBo.java index 8e44af21..9e429be2 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipRequest.java similarity index 92% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderShipRequest.java index 9cec4af3..99cea075 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipSendBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipSendBo.java similarity index 67% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipSendBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/OrderShipSendBo.java index 7c64272d..82d21286 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/OrderShipSendBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/OrderShipSendBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundProcessingBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/RefundProcessingBo.java similarity index 90% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundProcessingBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/RefundProcessingBo.java index 4664e001..3a3234c6 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundProcessingBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/RefundProcessingBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundSearchBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/RefundSearchBo.java similarity index 84% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundSearchBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/RefundSearchBo.java index c46d772e..bf62bbb8 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/RefundSearchBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/RefundSearchBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpBo.java similarity index 81% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpBo.java index c3f1f0cf..96ec71cc 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpCompleteBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpCompleteBo.java similarity index 82% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpCompleteBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpCompleteBo.java index 6dbe6d1c..8aa430b0 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipStockUpCompleteBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/ShipStockUpCompleteBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipWaybillBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/ShipWaybillBo.java similarity index 76% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipWaybillBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/ShipWaybillBo.java index 2e53434a..7ef201ba 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/ShipWaybillBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/ShipWaybillBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/SupplierOrderShipBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/SupplierOrderShipBo.java similarity index 82% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/SupplierOrderShipBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/SupplierOrderShipBo.java index a12dc907..f9b7ddc4 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/bo/SupplierOrderShipBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/SupplierOrderShipBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java similarity index 89% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java index 2a2467b4..e8b61ce3 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoGoodsBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderBo.java similarity index 86% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderBo.java index d4549d23..d5f1149f 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderConfirmBo.java similarity index 91% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderConfirmBo.java index 3db47701..5f16b212 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderConfirmBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderConfirmBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderPushBo.java similarity index 64% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderPushBo.java index 782fc60e..007e095d 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderPushBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderShipBo.java similarity index 78% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderShipBo.java index 0e2eef7c..dec462c4 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoOrderShipBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoRefundBo.java similarity index 77% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoRefundBo.java index 675bdf16..d0201179 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoRefundBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/TaoTokenSaveBo.java similarity index 74% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/TaoTokenSaveBo.java index 476227b3..89230078 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/TaoTokenSaveBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderConfirmBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderConfirmBo.java similarity index 91% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderConfirmBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderConfirmBo.java index b06d0248..ec038d91 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderConfirmBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderConfirmBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderPushBo.java similarity index 64% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderPushBo.java index bdcb62d3..49475001 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/bo/WeiOrderPushBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/WeiOrderPushBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockIn.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockIn.java similarity index 97% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockIn.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpStockIn.java index 8822ca59..926791d1 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockIn.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockIn.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockInItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockInItem.java similarity index 97% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockInItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpStockInItem.java index 2b8ccaa8..40b6bee4 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockInItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockInItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockOutItemPosition.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItemPosition.java similarity index 96% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockOutItemPosition.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItemPosition.java index 0076c1bc..26c10b79 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpStockOutItemPosition.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpStockOutItemPosition.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehouse.java similarity index 96% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehouse.java index 747e3376..c129161a 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehouse.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehouse.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java b/core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehousePosition.java similarity index 96% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java rename to core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehousePosition.java index f849bd4c..1d5460d7 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/ErpWarehousePosition.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/ErpWarehousePosition.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdGoods.java similarity index 98% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdGoods.java index 2e556129..8a6f7082 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdGoods.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdGoodsSku.java similarity index 97% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdGoodsSku.java index 1ba588b3..6cf6a9fc 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrder.java similarity index 99% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdOrder.java index 2f0fb6a2..2e1ccaac 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrder.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrderCoupon.java similarity index 95% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdOrderCoupon.java index a43c00ac..8eef4b24 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrderCoupon.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java similarity index 97% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java index 269e6b18..3f47d871 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/JdRefund.java similarity index 99% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/JdRefund.java index ffc617ed..ced8e80d 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/JdRefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.math.BigDecimal; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OAfterSale.java b/core/model/src/main/java/cn/qihangerp/model/entity/OAfterSale.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OAfterSale.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OAfterSale.java index b5fb8173..46d114d7 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OAfterSale.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OAfterSale.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipList.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipList.java index 1776a85d..f011c1db 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipList.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipList.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipListItem.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipListItem.java index 73a10e12..4ad23fe2 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OOrderShipListItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OOrderShipListItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipWaybill.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShipWaybill.java similarity index 96% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipWaybill.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShipWaybill.java index b1511446..a3fbfdf5 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipWaybill.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShipWaybill.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShipment.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShipment.java index 4dcaf968..8be0743b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipment.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShipment.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/OShipmentItem.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OShipmentItem.java index 21021a28..6ecdc431 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OShipmentItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OShipmentItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineGoodsSku.java similarity index 97% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OfflineGoodsSku.java index e326d3f3..b1c516f3 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.math.BigDecimal; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrder.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrder.java index 28fc6348..e0ba96cb 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrder.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.math.BigDecimal; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrderItem.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrderItem.java index b56ff292..5f676e0a 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineRefund.java similarity index 98% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OfflineRefund.java index ec040b3e..d01c281c 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/OfflineRefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OfflineRefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoGoods.java similarity index 98% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoGoods.java index fed4f983..559bdd80 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoGoods.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java similarity index 98% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java index 4f48edf5..7be379ed 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrder.java similarity index 99% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoOrder.java index 5180d337..d919a4d1 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrder.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java similarity index 99% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java index 676e905d..360d0541 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderPromotion.java similarity index 97% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderPromotion.java index 9473bc94..46f8bed3 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoOrderPromotion.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/TaoRefund.java similarity index 99% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/TaoRefund.java index 4d588bbf..da01ccbf 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/TaoRefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiGoods.java similarity index 97% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiGoods.java index 7b8cd8ba..8fa9e14f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoods.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiGoods.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiGoodsSku.java similarity index 97% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiGoodsSku.java index a42abd29..9b589755 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiOrder.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiOrder.java index 288c217e..0463cfa4 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiOrder.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java index 81963175..2e96b28a 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java index 247e63bc..8a0f1c34 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiRefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiRefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiWaybillAccount.java b/core/model/src/main/java/cn/qihangerp/model/entity/WeiWaybillAccount.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiWaybillAccount.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WeiWaybillAccount.java index ef9084d6..d6477b27 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/domain/WeiWaybillAccount.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WeiWaybillAccount.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsInventoryOperation.java b/core/model/src/main/java/cn/qihangerp/model/entity/WmsInventoryOperation.java similarity index 98% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsInventoryOperation.java rename to core/model/src/main/java/cn/qihangerp/model/entity/WmsInventoryOperation.java index b487de94..0c2349ea 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/domain/WmsInventoryOperation.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/WmsInventoryOperation.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/GoodsSkuInventoryVo.java b/core/model/src/main/java/cn/qihangerp/model/request/GoodsSkuInventoryVo.java similarity index 94% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/GoodsSkuInventoryVo.java rename to core/model/src/main/java/cn/qihangerp/model/request/GoodsSkuInventoryVo.java index 5f0d880e..75b943a7 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/GoodsSkuInventoryVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/GoodsSkuInventoryVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java b/core/model/src/main/java/cn/qihangerp/model/request/StockInCreateItem.java similarity index 85% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockInCreateItem.java index 23d492cb..ced15b6c 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockInCreateItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateRequest.java b/core/model/src/main/java/cn/qihangerp/model/request/StockInCreateRequest.java similarity index 87% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateRequest.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockInCreateRequest.java index b9c2a1e8..22fb2878 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInCreateRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockInCreateRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInItem.java b/core/model/src/main/java/cn/qihangerp/model/request/StockInItem.java similarity index 79% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInItem.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockInItem.java index da3fe9f1..df61ccb4 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockInItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInRequest.java b/core/model/src/main/java/cn/qihangerp/model/request/StockInRequest.java similarity index 83% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInRequest.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockInRequest.java index fc23dd11..1c16aa9a 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockInRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockInRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutCreateRequest.java b/core/model/src/main/java/cn/qihangerp/model/request/StockOutCreateRequest.java similarity index 86% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutCreateRequest.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockOutCreateRequest.java index c9479504..f5dff01a 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutCreateRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockOutCreateRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutItemRequest.java b/core/model/src/main/java/cn/qihangerp/model/request/StockOutItemRequest.java similarity index 86% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutItemRequest.java rename to core/model/src/main/java/cn/qihangerp/model/request/StockOutItemRequest.java index dccdd01f..061120d4 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/request/StockOutItemRequest.java +++ b/core/model/src/main/java/cn/qihangerp/model/request/StockOutItemRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.request; +package cn.qihangerp.model.request; import lombok.Data; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/JdGoodsSkuListVo.java similarity index 53% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/JdGoodsSkuListVo.java index d3b311b3..0a3aaf63 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/JdGoodsSkuListVo.java @@ -1,6 +1,6 @@ -package cn.qihangerp.module.open.jd.domain.vo; +package cn.qihangerp.model.vo; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; +import cn.qihangerp.model.entity.JdGoodsSku; import lombok.Data; @Data diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesDailyVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/SalesDailyVo.java similarity index 75% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesDailyVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/SalesDailyVo.java index 2b1fd700..21551310 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesDailyVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/SalesDailyVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.vo; +package cn.qihangerp.model.vo; import lombok.Data; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesTopSkuVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/SalesTopSkuVo.java similarity index 71% rename from serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesTopSkuVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/SalesTopSkuVo.java index 4ec386e2..8deee49b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/domain/vo/SalesTopSkuVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/SalesTopSkuVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.order.domain.vo; +package cn.qihangerp.model.vo; import lombok.Data; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/TaoGoodsSkuListVo.java similarity index 65% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/TaoGoodsSkuListVo.java index 769a8c96..74349395 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/TaoGoodsSkuListVo.java @@ -1,7 +1,6 @@ -package cn.qihangerp.module.open.tao.domain.vo; +package cn.qihangerp.model.vo; - -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; +import cn.qihangerp.model.entity.TaoGoodsSku; import lombok.Data; @Data diff --git a/docs/preview.png b/docs/preview.png index 564e7bec80e88c39a3c66d9f38d0a0d66a9a7063..b046d2edfef8f61e8f99799ec283e223fad5e523 100644 GIT binary patch literal 210912 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�pi6{PoaMP$F7Ajcf1%KE0hvy@ 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 z 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 Doe*{& diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java index 2bb02c24..249f5150 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java @@ -8,7 +8,7 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; +import cn.qihangerp.model.entity.JdGoodsSku; import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java index cfefd670..dc2f99e5 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java @@ -4,9 +4,9 @@ package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.jd.domain.JdGoods; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; +import cn.qihangerp.model.entity.JdGoods; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.bo.JdGoodsBo; import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.open.jd.service.JdGoodsSkuService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java index 3182aee7..01f52db8 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.model.entity.OShopPlatform; -import cn.qihangerp.module.open.jd.domain.bo.JdTokenCreateBo; +import cn.qihangerp.model.bo.JdTokenCreateBo; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java index 7c444151..eb6e6cbf 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java @@ -12,7 +12,7 @@ import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.jd.domain.JdRefund; +import cn.qihangerp.model.entity.JdRefund; import cn.qihangerp.module.open.jd.service.JdRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java index 7e94d567..e484e51a 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.jd.domain.JdRefund; -import cn.qihangerp.module.open.jd.domain.bo.JdAfterBo; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderPushBo; +import cn.qihangerp.model.entity.JdRefund; +import cn.qihangerp.model.bo.JdAfterBo; +import cn.qihangerp.model.bo.JdOrderPushBo; import cn.qihangerp.module.open.jd.service.JdOrderService; import cn.qihangerp.module.open.jd.service.JdRefundService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java index c014824f..babf26de 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java @@ -11,8 +11,8 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.jd.domain.JdOrder; -import cn.qihangerp.module.open.jd.domain.JdOrderItem; +import cn.qihangerp.model.entity.JdOrder; +import cn.qihangerp.model.entity.JdOrderItem; import cn.qihangerp.module.open.jd.service.JdOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java index 1bb58cda..fba63db2 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.jd.domain.JdOrder; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderBo; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderPushBo; +import cn.qihangerp.model.entity.JdOrder; +import cn.qihangerp.model.bo.JdOrderBo; +import cn.qihangerp.model.bo.JdOrderPushBo; import cn.qihangerp.module.open.jd.service.JdOrderService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java index d6b9bb1e..83f08c96 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.jd.domain.JdOrder; +import cn.qihangerp.model.entity.JdOrder; import cn.qihangerp.module.open.jd.service.JdOrderService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java index 49f01b56..d7f047fe 100644 --- a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.jd.domain.JdRefund; +import cn.qihangerp.model.entity.JdRefund; import cn.qihangerp.module.open.jd.service.JdRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java index c37cec9c..9364e220 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/AfterSaleProcessingController.java @@ -4,7 +4,7 @@ package cn.qihangerp.api.order.controller; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.OAfterSale; +import cn.qihangerp.model.entity.OAfterSale; import cn.qihangerp.module.order.service.OAfterSaleService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java index efb9d252..60dd38b2 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineGoodsController.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.OfflineGoodsSku; +import cn.qihangerp.model.entity.OfflineGoodsSku; import cn.qihangerp.module.order.service.OfflineGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java index f51df507..0208abda 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineOrderController.java @@ -8,8 +8,8 @@ import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; -import cn.qihangerp.module.order.domain.bo.OfflineOrderPushBo; +import cn.qihangerp.model.bo.OfflineOrderCreateBo; +import cn.qihangerp.model.bo.OfflineOrderPushBo; import cn.qihangerp.module.order.service.OfflineOrderService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java index f12c564f..96bd4394 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OfflineShipController.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.order.domain.OfflineOrder; -import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo; -import cn.qihangerp.module.order.domain.bo.OrderShipSendBo; +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.security.common.BaseController; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java index c08c552c..be97832f 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderController.java @@ -3,8 +3,8 @@ package cn.qihangerp.api.order.controller; import cn.qihangerp.api.order.OrderCancelRequest; import cn.qihangerp.common.*; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; -import cn.qihangerp.module.order.domain.bo.OrderShipRequest; +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.security.common.BaseController; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java index 1280fa3a..3b1c9b13 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderItemController.java @@ -6,7 +6,7 @@ import cn.qihangerp.api.order.OrderItemSpecIdUpdateBo; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.bo.OrderItemListBo; +import cn.qihangerp.model.bo.OrderItemListBo; import cn.qihangerp.module.order.service.OOrderItemService; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java index b4363472..436796f3 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/OrderShipController.java @@ -6,9 +6,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -import cn.qihangerp.module.order.domain.bo.SupplierOrderShipBo; +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.security.common.BaseController; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java index af1a39f7..c198754f 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/RefundController.java @@ -6,8 +6,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.bo.RefundProcessingBo; -import cn.qihangerp.module.order.domain.bo.RefundSearchBo; +import cn.qihangerp.model.bo.RefundProcessingBo; +import cn.qihangerp.model.bo.RefundSearchBo; import cn.qihangerp.module.order.service.ORefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java index 8ee31350..9ecd2416 100644 --- a/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java +++ b/microservices/order-api/src/main/java/cn/qihangerp/api/order/controller/ShipmentController.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.order.domain.OShipment; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; +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.security.common.BaseController; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java index eab8a764..a546b35d 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java @@ -1,8 +1,8 @@ package cn.qihangerp.api.tao; -import cn.qihangerp.module.open.tao.domain.TaoOrder; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.model.entity.TaoOrder; +import cn.qihangerp.model.entity.TaoOrderItem; import cn.qihangerp.open.tao.response.TaoOrderDetailResponse; import cn.qihangerp.open.tao.response.TaoOrderListResponse; import org.springframework.util.StringUtils; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java index 59fa2ad3..37f2da84 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java @@ -12,8 +12,8 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; +import cn.qihangerp.model.entity.TaoGoods; +import cn.qihangerp.model.entity.TaoGoodsSku; import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java index 2279fea8..65a48c91 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java @@ -4,9 +4,9 @@ package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; +import cn.qihangerp.model.entity.TaoGoods; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java index 3475d001..02ced4e0 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java @@ -3,7 +3,7 @@ package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.OShopPlatform; -import cn.qihangerp.module.open.tao.domain.bo.TaoTokenSaveBo; +import cn.qihangerp.model.bo.TaoTokenSaveBo; import cn.qihangerp.module.service.OShopPlatformService; import cn.qihangerp.module.service.OShopService; import jakarta.servlet.http.HttpServletRequest; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java index 19c250dd..181e504d 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java @@ -13,7 +13,7 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.tao.domain.TaoOrder; +import cn.qihangerp.model.entity.TaoOrder; import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; @@ -26,7 +26,6 @@ import cn.qihangerp.open.tao.response.TaoOrderListResponse; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import java.io.IOException; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java index 038aef3e..fd3bfa56 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java @@ -4,15 +4,14 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.tao.domain.TaoOrder; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderConfirmBo; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderPushBo; +import cn.qihangerp.model.entity.TaoOrder; +import cn.qihangerp.model.bo.TaoOrderBo; +import cn.qihangerp.model.bo.TaoOrderConfirmBo; +import cn.qihangerp.model.bo.TaoOrderPushBo; import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java index 57506578..1c9d54bc 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java @@ -12,7 +12,7 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.tao.domain.TaoRefund; +import cn.qihangerp.model.entity.TaoRefund; import cn.qihangerp.module.open.tao.service.TaoRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java index 9cde74b4..31baee7b 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.tao.domain.TaoRefund; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderPushBo; -import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; +import cn.qihangerp.model.entity.TaoRefund; +import cn.qihangerp.model.bo.TaoOrderPushBo; +import cn.qihangerp.model.bo.TaoRefundBo; import cn.qihangerp.module.open.tao.service.TaoRefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java index c982b239..df600b50 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java @@ -2,7 +2,7 @@ package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderShipBo; +import cn.qihangerp.model.bo.TaoOrderShipBo; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import lombok.extern.java.Log; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java index 5962d874..83d6be02 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.tao.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.tao.domain.TaoOrder; +import cn.qihangerp.model.entity.TaoOrder; import cn.qihangerp.module.open.tao.service.TaoOrderService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java index 4bbb1eea..fbf575ad 100644 --- a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.tao.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.tao.domain.TaoRefund; +import cn.qihangerp.model.entity.TaoRefund; import cn.qihangerp.module.open.tao.service.TaoRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java index c6e6eb94..9000a029 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/GoodsApiController.java @@ -7,8 +7,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.module.open.wei.domain.WeiGoods; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoods; +import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.module.open.wei.service.WeiGoodsService; import cn.qihangerp.open.common.ApiResultVo; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java index 609b980f..f2dbf052 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiGoodsController.java @@ -4,8 +4,8 @@ package cn.qihangerp.api.wei.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.wei.domain.WeiGoods; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoods; +import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.module.open.wei.service.WeiGoodsService; import cn.qihangerp.module.open.wei.service.WeiGoodsSkuService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java index 6eaf57f3..fb242c4b 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderApiController.java @@ -7,8 +7,8 @@ import cn.qihangerp.api.wei.WeiApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.module.open.wei.domain.WeiOrder; -import cn.qihangerp.module.open.wei.domain.WeiOrderItem; +import cn.qihangerp.model.entity.WeiOrder; +import cn.qihangerp.model.entity.WeiOrderItem; import cn.qihangerp.module.open.wei.service.WeiOrderService; import cn.qihangerp.open.common.ApiResultVo; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java index 8f8488c1..7263c0ee 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiOrderController.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.wei.domain.WeiOrder; -import cn.qihangerp.module.open.wei.domain.bo.WeiOrderConfirmBo; -import cn.qihangerp.module.open.wei.domain.bo.WeiOrderPushBo; +import cn.qihangerp.model.entity.WeiOrder; +import cn.qihangerp.model.bo.WeiOrderConfirmBo; +import cn.qihangerp.model.bo.WeiOrderPushBo; import cn.qihangerp.module.open.wei.service.WeiOrderService; import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java index 14a7bb5c..a1a4fa75 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundApiController.java @@ -6,7 +6,7 @@ import cn.qihangerp.api.wei.WeiApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.HttpStatus; -import cn.qihangerp.module.open.wei.domain.WeiRefund; +import cn.qihangerp.model.entity.WeiRefund; import cn.qihangerp.module.open.wei.service.WeiRefundService; import cn.qihangerp.open.common.ApiResultVo; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java index 12ac3dcc..6c962d5d 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/WeiRefundController.java @@ -10,8 +10,8 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.wei.domain.WeiRefund; -import cn.qihangerp.module.open.wei.domain.bo.WeiOrderPushBo; +import cn.qihangerp.model.entity.WeiRefund; +import cn.qihangerp.model.bo.WeiOrderPushBo; import cn.qihangerp.module.open.wei.service.WeiRefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java index ca4ed45b..8314c6cf 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiOrderFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.wei.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.wei.domain.WeiOrder; +import cn.qihangerp.model.entity.WeiOrder; import cn.qihangerp.module.open.wei.service.WeiOrderService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java index 17b55ea0..b943d625 100644 --- a/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java +++ b/microservices/wei-api/src/main/java/cn/qihangerp/api/wei/controller/feign/WeiRefundFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.wei.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.wei.domain.WeiRefund; +import cn.qihangerp.model.entity.WeiRefund; import cn.qihangerp.module.open.wei.service.WeiRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java index 8f2472c4..7df01c67 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdGoods; +import cn.qihangerp.model.entity.JdGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_jd_goods(京东商品表)】的数据库操作Mapper * @createDate 2025-05-19 18:49:18 -* @Entity cn.qihangerp.module.open.jd.domain.JdGoods +* @Entity cn.qihangerp.model.entity.JdGoods */ public interface JdGoodsMapper extends BaseMapper { diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java index 31272885..041b5f19 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.vo.JdGoodsSkuListVo; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.vo.JdGoodsSkuListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Param; * @author qilip * @description 针对表【oms_jd_goods_sku(京东商品SKU表)】的数据库操作Mapper * @createDate 2025-05-19 18:50:56 -* @Entity cn.qihangerp.module.open.jd.domain.JdGoodsSku +* @Entity cn.qihangerp.model.entity.JdGoodsSku */ public interface JdGoodsSkuMapper extends BaseMapper { IPage selectSkuPageList(Page page, diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java index 68d5fea9..00164c0c 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdOrderCoupon; +import cn.qihangerp.model.entity.JdOrderCoupon; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java index 602b16fa..9c41f2b3 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdOrderItem; +import cn.qihangerp.model.entity.JdOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_jd_order_item(京东订单明细表)】的数据库操作Mapper * @createDate 2025-05-19 22:37:54 -* @Entity cn.qihangerp.module.open.jd.domain.JdOrderItem +* @Entity cn.qihangerp.model.entity.JdOrderItem */ public interface JdOrderItemMapper extends BaseMapper { diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java index a786c9e9..c680ab3f 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdOrder; +import cn.qihangerp.model.entity.JdOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java index 7db723ac..d575455a 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.mapper; -import cn.qihangerp.module.open.jd.domain.JdRefund; +import cn.qihangerp.model.entity.JdRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java index 1696fa7a..dca1bc2a 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java @@ -4,9 +4,9 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdGoods; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; +import cn.qihangerp.model.entity.JdGoods; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.bo.JdGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java index ccfbd6ab..abae9fee 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.bo.JdGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java index f8a73c61..d8a6500b 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.jd.service; -import cn.qihangerp.module.open.jd.domain.JdOrderCoupon; +import cn.qihangerp.model.entity.JdOrderCoupon; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java index fba154bc..2d222b3c 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.jd.service; -import cn.qihangerp.module.open.jd.domain.JdOrderItem; +import cn.qihangerp.model.entity.JdOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java index 4892f185..c4547e81 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.open.jd.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdOrder; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderBo; +import cn.qihangerp.model.entity.JdOrder; +import cn.qihangerp.model.bo.JdOrderBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java index acef327e..eff1a67a 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.open.jd.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.jd.domain.JdRefund; -import cn.qihangerp.module.open.jd.domain.bo.JdAfterBo; +import cn.qihangerp.model.entity.JdRefund; +import cn.qihangerp.model.bo.JdAfterBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java index a3f09c49..4e8bbca2 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java @@ -17,10 +17,10 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.module.open.jd.domain.JdGoods; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; +import cn.qihangerp.model.entity.JdGoods; +import cn.qihangerp.model.entity.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; +import cn.qihangerp.model.bo.JdGoodsBo; import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; import cn.qihangerp.module.open.jd.service.JdGoodsService; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java index e1a4712d..e7717501 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java @@ -6,15 +6,15 @@ import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.jd.domain.JdGoods; +import cn.qihangerp.model.entity.JdGoods; import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper; 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.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.bo.JdGoodsBo; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.bo.JdGoodsBo; import cn.qihangerp.module.open.jd.service.JdGoodsSkuService; import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java index 56ec6099..bf605107 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.jd.service.impl; -import cn.qihangerp.module.open.jd.domain.JdOrderCoupon; +import cn.qihangerp.model.entity.JdOrderCoupon; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.module.open.jd.service.JdOrderCouponService; import cn.qihangerp.module.open.jd.mapper.JdOrderCouponMapper; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java index 4c49a6d2..ebfd0cba 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.jd.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.open.jd.domain.JdOrderItem; +import cn.qihangerp.model.entity.JdOrderItem; import cn.qihangerp.module.open.jd.service.JdOrderItemService; import cn.qihangerp.module.open.jd.mapper.JdOrderItemMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java index 411b819f..e78d33f1 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java @@ -1,8 +1,8 @@ package cn.qihangerp.module.open.jd.service.impl; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.JdOrder; -import cn.qihangerp.module.open.jd.domain.JdOrderCoupon; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.entity.JdOrder; +import cn.qihangerp.model.entity.JdOrderCoupon; import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,8 +11,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.jd.domain.JdOrderItem; -import cn.qihangerp.module.open.jd.domain.bo.JdOrderBo; +import cn.qihangerp.model.entity.JdOrderItem; +import cn.qihangerp.model.bo.JdOrderBo; import cn.qihangerp.module.open.jd.mapper.JdOrderCouponMapper; import cn.qihangerp.module.open.jd.mapper.JdOrderItemMapper; import cn.qihangerp.module.open.jd.service.JdOrderService; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java index e2b526d6..ed847d1a 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java @@ -4,9 +4,9 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.jd.domain.JdGoodsSku; -import cn.qihangerp.module.open.jd.domain.JdRefund; -import cn.qihangerp.module.open.jd.domain.bo.JdAfterBo; +import cn.qihangerp.model.entity.JdGoodsSku; +import cn.qihangerp.model.entity.JdRefund; +import cn.qihangerp.model.bo.JdAfterBo; import cn.qihangerp.module.open.jd.mapper.JdOrderItemMapper; import cn.qihangerp.module.open.jd.mapper.JdOrderMapper; import cn.qihangerp.module.open.jd.mapper.JdRefundMapper; diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml index 8d14af8a..1ff5b406 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml index da451701..a3ed39fa 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -35,7 +35,7 @@ erp_goods_sku_id,shop_id,create_time,update_time - SELECT sku.*,ogs.outer_erp_sku_id FROM oms_jd_goods_sku sku LEFT JOIN o_goods_sku ogs on ogs.id = sku.erp_goods_sku_id diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml index dd66aa84..03a3ed29 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml index 4e3b002f..f3956261 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml index e50e0955..36a0d598 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml index 519d9c13..3feb4b59 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java index 38bbb347..cdb63191 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OAfterSaleMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OAfterSale; +import cn.qihangerp.model.entity.OAfterSale; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_after_sale(OMS售后处理表)】的数据库操作Mapper * @createDate 2024-09-15 21:30:30 -* @Entity cn.qihangerp.module.order.domain.OAfterSale +* @Entity cn.qihangerp.model.entity.OAfterSale */ public interface OAfterSaleMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java index 9a341b85..1cc65fd5 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderItemMapper.java @@ -1,9 +1,9 @@ package cn.qihangerp.module.order.mapper; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.order.domain.bo.OrderItemListBo; +import cn.qihangerp.model.bo.OrderItemListBo; import cn.qihangerp.model.vo.OrderItemListVo; -import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; +import cn.qihangerp.model.vo.SalesTopSkuVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java index fb94a2bd..a16b531a 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderMapper.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.order.mapper; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.vo.OrderDiscountVo; -import cn.qihangerp.module.order.domain.vo.SalesDailyVo; +import cn.qihangerp.model.vo.SalesDailyVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java index fc9156b2..a7aa7338 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListItemMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OOrderShipListItem; +import cn.qihangerp.model.entity.OOrderShipListItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_order_ship_list_item(发货-备货表（打单加入备货清单）)】的数据库操作Mapper * @createDate 2025-05-24 16:03:35 -* @Entity cn.qihangerp.module.order.domain.OOrderShipListItem +* @Entity cn.qihangerp.model.entity.OOrderShipListItem */ public interface OOrderShipListItemMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java index d69be9be..ae2b056a 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OOrderShipListMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OOrderShipList; +import cn.qihangerp.model.entity.OOrderShipList; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_order_ship_list(发货-备货表（取号发货加入备货清单、分配供应商发货加入备货清单）)】的数据库操作Mapper * @createDate 2025-05-24 16:03:35 -* @Entity cn.qihangerp.module.order.domain.OOrderShipList +* @Entity cn.qihangerp.model.entity.OOrderShipList */ public interface OOrderShipListMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java index 4e372380..df928152 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipWaybillMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OShipWaybill; +import cn.qihangerp.model.entity.OShipWaybill; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_ship_waybill(发货电子面单记录表（打单记录）)】的数据库操作Mapper * @createDate 2024-07-28 18:29:53 -* @Entity cn.qihangerp.module.order.domain.OShipWaybill +* @Entity cn.qihangerp.model.entity.OShipWaybill */ public interface OShipWaybillMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java index bd31a2d3..21cdee45 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentItemMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OShipmentItem; +import cn.qihangerp.model.entity.OShipmentItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_shipment_item(发货-发货记录明细表)】的数据库操作Mapper * @createDate 2025-05-24 16:21:35 -* @Entity cn.qihangerp.module.order.domain.OShipmentItem +* @Entity cn.qihangerp.model.entity.OShipmentItem */ public interface OShipmentItemMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java index d126cdc1..cf2ab5bb 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OShipmentMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OShipment; +import cn.qihangerp.model.entity.OShipment; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_shipment(发货-发货记录表)】的数据库操作Mapper * @createDate 2025-05-24 16:26:06 -* @Entity cn.qihangerp.module.order.domain.OShipment +* @Entity cn.qihangerp.model.entity.OShipment */ public interface OShipmentMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java index 2eb3ec05..b81af378 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineGoodsSkuMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OfflineGoodsSku; +import cn.qihangerp.model.entity.OfflineGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【offline_goods_sku(OMS商品SKU表)】的数据库操作Mapper * @createDate 2024-07-27 21:22:27 -* @Entity cn.qihangerp.module.order.domain.OfflineGoodsSku +* @Entity cn.qihangerp.model.entity.OfflineGoodsSku */ public interface OfflineGoodsSkuMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java index 48999c48..a7f7626c 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderItemMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OfflineOrderItem; +import cn.qihangerp.model.entity.OfflineOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【offline_order_item(渠道订单明细表)】的数据库操作Mapper * @createDate 2024-07-27 23:40:22 -* @Entity cn.qihangerp.module.order.domain.OfflineOrderItem +* @Entity cn.qihangerp.model.entity.OfflineOrderItem */ public interface OfflineOrderItemMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java index 89e96dc9..e122776a 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineOrderMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OfflineOrder; +import cn.qihangerp.model.entity.OfflineOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【offline_order(线下渠道订单表)】的数据库操作Mapper * @createDate 2024-07-27 23:03:38 -* @Entity cn.qihangerp.module.order.domain.OfflineOrder +* @Entity cn.qihangerp.model.entity.OfflineOrder */ public interface OfflineOrderMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java index b6d3ddbf..a54f0165 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/mapper/OfflineRefundMapper.java @@ -1,14 +1,14 @@ package cn.qihangerp.module.order.mapper; -import cn.qihangerp.module.order.domain.OfflineRefund; +import cn.qihangerp.model.entity.OfflineRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【offline_refund(线下渠道退款表)】的数据库操作Mapper * @createDate 2024-09-16 13:31:26 -* @Entity cn.qihangerp.module.order.domain.OfflineRefund +* @Entity cn.qihangerp.model.entity.OfflineRefund */ public interface OfflineRefundMapper extends BaseMapper { diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java index 0179cc2a..c3e647aa 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentItemService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.service; -import cn.qihangerp.module.order.domain.OShipmentItem; +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/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java index 9c1b8b6a..dafaf7cc 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ErpShipmentService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.order.domain.OShipment; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; +import cn.qihangerp.model.entity.OShipment; +import cn.qihangerp.model.bo.OrderShipBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java index b3f4aa19..3742f013 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OAfterSaleService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OAfterSale; +import cn.qihangerp.model.entity.OAfterSale; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java index 2fb0fc67..4a5f053c 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderItemService.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.order.domain.bo.OrderItemListBo; +import cn.qihangerp.model.bo.OrderItemListBo; import cn.qihangerp.model.vo.OrderItemListVo; -import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; +import cn.qihangerp.model.vo.SalesTopSkuVo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java index 0e135f01..826d2a08 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderService.java @@ -3,9 +3,9 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.model.request.OrderSearchRequest; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; -import cn.qihangerp.module.order.domain.bo.OrderShipRequest; -import cn.qihangerp.module.order.domain.vo.SalesDailyVo; +import cn.qihangerp.model.bo.OrderAllocateShipRequest; +import cn.qihangerp.model.bo.OrderShipRequest; +import cn.qihangerp.model.vo.SalesDailyVo; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import cn.qihangerp.common.PageQuery; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java index 3999b435..3c7a3753 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListItemService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.order.domain.OOrderShipListItem; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; +import cn.qihangerp.model.entity.OOrderShipListItem; +import cn.qihangerp.model.bo.ShipStockUpBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java index 96ea97d6..c4b448a7 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OOrderShipListService.java @@ -3,10 +3,9 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.order.domain.OOrderShipList; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -import cn.qihangerp.module.order.domain.bo.SupplierOrderShipBo; +import cn.qihangerp.model.entity.OOrderShipList; +import cn.qihangerp.model.bo.ShipStockUpBo; +import cn.qihangerp.model.bo.SupplierOrderShipBo; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java index 21e65077..e01d9b32 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/ORefundService.java @@ -2,8 +2,8 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.model.entity.ORefund; -import cn.qihangerp.module.order.domain.bo.RefundProcessingBo; -import cn.qihangerp.module.order.domain.bo.RefundSearchBo; +import cn.qihangerp.model.bo.RefundProcessingBo; +import cn.qihangerp.model.bo.RefundSearchBo; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import cn.qihangerp.common.PageQuery; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java index f0474775..e0608e48 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OShipWaybillService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.service; -import cn.qihangerp.module.order.domain.OShipWaybill; +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/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java index ec30ee7f..9c720e16 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineGoodsSkuService.java @@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.order.domain.OfflineGoodsSku; +import cn.qihangerp.model.entity.OfflineGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java index 1bed3364..2127d844 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderItemService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.order.service; -import cn.qihangerp.module.order.domain.OfflineOrderItem; +import cn.qihangerp.model.entity.OfflineOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java index f6b02330..36ef8d39 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineOrderService.java @@ -3,9 +3,9 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.order.domain.OfflineOrder; -import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; -import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo; +import cn.qihangerp.model.entity.OfflineOrder; +import cn.qihangerp.model.bo.OfflineOrderCreateBo; +import cn.qihangerp.model.bo.OfflineOrderShipBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java index d69a3c81..b2659a86 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/OfflineRefundService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.model.request.RefundSearchRequest; -import cn.qihangerp.module.order.domain.OfflineRefund; +import cn.qihangerp.model.entity.OfflineRefund; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java index b59de330..d392b42b 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentItemServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.OShipmentItem; +import cn.qihangerp.model.entity.OShipmentItem; import cn.qihangerp.module.order.mapper.OShipmentItemMapper; import cn.qihangerp.module.order.service.ErpShipmentItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java index 2b9a589e..1a26d89e 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ErpShipmentServiceImpl.java @@ -7,9 +7,9 @@ import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.model.entity.OShop; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; import cn.qihangerp.module.mapper.OShopMapper; -import cn.qihangerp.module.order.domain.OShipment; -import cn.qihangerp.module.order.domain.OShipmentItem; -import cn.qihangerp.module.order.domain.bo.OrderShipBo; +import cn.qihangerp.model.entity.OShipment; +import cn.qihangerp.model.entity.OShipmentItem; +import cn.qihangerp.model.bo.OrderShipBo; import cn.qihangerp.module.order.mapper.OShipmentItemMapper; import cn.qihangerp.module.order.mapper.OShipmentMapper; import cn.qihangerp.module.order.service.ErpShipmentService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java index 9e5d3805..f939f192 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OAfterSaleServiceImpl.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.order.domain.OAfterSale; +import cn.qihangerp.model.entity.OAfterSale; import cn.qihangerp.module.order.mapper.OAfterSaleMapper; import cn.qihangerp.module.order.service.OAfterSaleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java index f1ff90ec..93a17e32 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderItemServiceImpl.java @@ -4,9 +4,9 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; -import cn.qihangerp.module.order.domain.bo.OrderItemListBo; +import cn.qihangerp.model.bo.OrderItemListBo; import cn.qihangerp.model.vo.OrderItemListVo; -import cn.qihangerp.module.order.domain.vo.SalesTopSkuVo; +import cn.qihangerp.model.vo.SalesTopSkuVo; import cn.qihangerp.module.order.mapper.OOrderItemMapper; import cn.qihangerp.module.order.service.OOrderItemService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 84606095..f4019d98 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -6,11 +6,10 @@ import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; -import cn.qihangerp.module.order.domain.*; -import cn.qihangerp.module.order.domain.bo.OrderAllocateShipRequest; -import cn.qihangerp.module.order.domain.bo.OrderShipRequest; +import cn.qihangerp.model.bo.OrderAllocateShipRequest; +import cn.qihangerp.model.bo.OrderShipRequest; import cn.qihangerp.model.vo.OrderDiscountVo; -import cn.qihangerp.module.order.domain.vo.SalesDailyVo; +import cn.qihangerp.model.vo.SalesDailyVo; import cn.qihangerp.module.order.mapper.*; import cn.qihangerp.module.order.service.OOrderService; import cn.qihangerp.module.order.service.msg.PddOrderMessageService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java index 26043c20..eacdcabe 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListItemServiceImpl.java @@ -5,11 +5,11 @@ 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.module.order.domain.bo.ShipStockUpBo; +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.module.order.domain.OOrderShipListItem; +import cn.qihangerp.model.entity.OOrderShipListItem; import cn.qihangerp.module.order.service.OOrderShipListItemService; import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java index c2974871..25821d28 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderShipListServiceImpl.java @@ -3,25 +3,22 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumStockOutType; import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpStockOutItemMapper; import cn.qihangerp.mapper.ErpStockOutMapper; import cn.qihangerp.model.entity.*; import cn.qihangerp.module.mapper.OLogisticsCompanyMapper; -import cn.qihangerp.module.order.domain.OOrderShipListItem; -import cn.qihangerp.module.order.domain.OfflineOrder; -import cn.qihangerp.module.order.domain.bo.ShipStockUpBo; -import cn.qihangerp.module.order.domain.bo.ShipStockUpCompleteBo; -import cn.qihangerp.module.order.domain.bo.SupplierOrderShipBo; +import cn.qihangerp.model.entity.OOrderShipListItem; +import cn.qihangerp.model.bo.ShipStockUpBo; +import cn.qihangerp.model.bo.SupplierOrderShipBo; import cn.qihangerp.module.order.mapper.OOrderItemMapper; import cn.qihangerp.module.order.mapper.OOrderMapper; import cn.qihangerp.module.order.mapper.OOrderShipListItemMapper; 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.module.order.domain.OOrderShipList; +import cn.qihangerp.model.entity.OOrderShipList; import cn.qihangerp.module.order.service.OOrderShipListService; import cn.qihangerp.module.order.mapper.OOrderShipListMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java index 44602ba9..67c41796 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java @@ -9,12 +9,12 @@ 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.module.order.domain.OAfterSale; +import cn.qihangerp.model.entity.OAfterSale; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.model.entity.ORefund; -import cn.qihangerp.module.order.domain.bo.RefundProcessingBo; -import cn.qihangerp.module.order.domain.bo.RefundSearchBo; +import cn.qihangerp.model.bo.RefundProcessingBo; +import cn.qihangerp.model.bo.RefundSearchBo; import cn.qihangerp.module.order.mapper.OAfterSaleMapper; import cn.qihangerp.module.order.mapper.OOrderItemMapper; import cn.qihangerp.module.order.mapper.OOrderMapper; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java index b980c1b4..784f9be8 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OShipWaybillServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.OShipWaybill; +import cn.qihangerp.model.entity.OShipWaybill; import cn.qihangerp.module.order.mapper.OShipWaybillMapper; import cn.qihangerp.module.order.service.OShipWaybillService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java index ef94a4ae..1ef11185 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java @@ -5,7 +5,7 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; -import cn.qihangerp.module.order.domain.OfflineGoodsSku; +import cn.qihangerp.model.entity.OfflineGoodsSku; import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper; import cn.qihangerp.module.order.service.OfflineGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java index 70b838ab..48afee00 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderItemServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.order.domain.OfflineOrderItem; +import cn.qihangerp.model.entity.OfflineOrderItem; import cn.qihangerp.module.order.mapper.OfflineOrderItemMapper; import cn.qihangerp.module.order.service.OfflineOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java index ceda6b47..3b95e298 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineOrderServiceImpl.java @@ -1,11 +1,11 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.order.domain.OfflineOrder; -import cn.qihangerp.module.order.domain.OfflineOrderItem; -import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateBo; -import cn.qihangerp.module.order.domain.bo.OfflineOrderCreateItemBo; -import cn.qihangerp.module.order.domain.bo.OfflineOrderShipBo; +import cn.qihangerp.model.entity.OfflineOrder; +import cn.qihangerp.model.entity.OfflineOrderItem; +import cn.qihangerp.model.bo.OfflineOrderCreateBo; +import cn.qihangerp.model.bo.OfflineOrderCreateItemBo; +import cn.qihangerp.model.bo.OfflineOrderShipBo; import cn.qihangerp.module.order.mapper.OfflineOrderItemMapper; import cn.qihangerp.module.order.mapper.OfflineOrderMapper; import cn.qihangerp.module.order.service.OfflineOrderService; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java index 31a2ba5b..e599ec99 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineRefundServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.model.request.RefundSearchRequest; -import cn.qihangerp.module.order.domain.OfflineRefund; +import cn.qihangerp.model.entity.OfflineRefund; import cn.qihangerp.module.order.mapper.OfflineRefundMapper; import cn.qihangerp.module.order.service.OfflineRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml b/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml index 0838f15e..9e664ddb 100644 --- a/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OAfterSaleMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml index e285d910..80bffa3d 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderItemMapper.xml @@ -50,7 +50,7 @@ create_by,update_time,update_by - SELECT oi.*,o.shop_id,o.order_time,gs.outer_erp_sku_id FROM o_order_item as oi @@ -93,7 +93,7 @@ WHERE oi.order_id = #{orderId} - SELECT sku_num as `name`, SUM(quantity) AS `value` diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml index aa5c7305..c049cf9f 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderMapper.xml @@ -69,7 +69,7 @@ select coupon_type as name,coupon_price as discount_amount from oms_jd_order_coupon where order_id = #{orderId} - SELECT DATE(order_time) AS date, COUNT(*) AS count, @@ -86,7 +86,7 @@ LIMIT 30 - SELECT COUNT(*) AS count, diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml index fb765bae..9fd66881 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderShipListItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml b/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml index 2cebfbb3..e73fae68 100644 --- a/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OOrderShipListMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml b/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml index d27c1e92..89b71d79 100644 --- a/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OShipWaybillMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml b/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml index ab2b8fb8..683ccdca 100644 --- a/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OShipmentItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml b/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml index c7687081..cd3b6f5e 100644 --- a/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OShipmentMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml b/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml index 750b0bea..350c2650 100644 --- a/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OfflineGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml b/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml index ad57ae47..3788f50c 100644 --- a/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OfflineOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml b/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml index ecacd10f..46a950cd 100644 --- a/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OfflineOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml b/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml index 393c00df..753f4d69 100644 --- a/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml +++ b/serviceImpl/order/src/main/resources/mapper/OfflineRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java index 5a30fc3a..8adc473f 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.ErpStockInItem; +import cn.qihangerp.model.entity.ErpStockInItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java index 8f5ffb63..52c55927 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.ErpStockIn; +import cn.qihangerp.model.entity.ErpStockIn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java index af45c12c..d1afbddc 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; +import cn.qihangerp.model.entity.ErpStockOutItemPosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java index bcc300b5..afc4b11f 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.ErpWarehouse; +import cn.qihangerp.model.entity.ErpWarehouse; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java index 10934dd7..1cb4faa2 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.model.entity.ErpWarehousePosition; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java index 4c8009e8..0b2c3406 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.mapper; -import cn.qihangerp.module.stock.domain.WmsInventoryOperation; +import cn.qihangerp.model.entity.WmsInventoryOperation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java index 2fe7e21d..75cb9859 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.WmsInventoryOperation; +import cn.qihangerp.model.entity.WmsInventoryOperation; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java index 850f5957..38e001d4 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.ErpStockInItem; +import cn.qihangerp.model.entity.ErpStockInItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java index 75c3689f..36d6934c 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java @@ -5,9 +5,9 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.stock.domain.ErpStockIn; -import cn.qihangerp.module.stock.request.StockInCreateRequest; -import cn.qihangerp.module.stock.request.StockInRequest; +import cn.qihangerp.model.entity.ErpStockIn; +import cn.qihangerp.model.request.StockInCreateRequest; +import cn.qihangerp.model.request.StockInRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java index 6e0d790b..4955249f 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; +import cn.qihangerp.model.entity.ErpStockOutItemPosition; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java index 132f40a7..c2020a2d 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.entity.ErpStockOut; -import cn.qihangerp.module.stock.request.StockOutCreateRequest; -import cn.qihangerp.module.stock.request.StockOutItemRequest; +import cn.qihangerp.model.request.StockOutCreateRequest; +import cn.qihangerp.model.request.StockOutItemRequest; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java index 0b60a709..edb3c101 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.model.entity.ErpWarehousePosition; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java index 8446ac75..d1c707a0 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.stock.service; -import cn.qihangerp.module.stock.domain.ErpWarehouse; +import cn.qihangerp.model.entity.ErpWarehouse; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java index 7b1af12f..7cd4db56 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.WmsInventoryOperation; +import cn.qihangerp.model.entity.WmsInventoryOperation; import cn.qihangerp.module.stock.mapper.WmsInventoryOperationMapper; import cn.qihangerp.module.stock.service.ErpInventoryOperationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java index b1fe8511..768e4973 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.ErpStockInItem; +import cn.qihangerp.model.entity.ErpStockInItem; import cn.qihangerp.module.stock.mapper.ErpStockInItemMapper; import cn.qihangerp.module.stock.service.ErpStockInItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java index 996f8676..5cc8d0f3 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java @@ -10,13 +10,13 @@ import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryService; -import cn.qihangerp.module.stock.domain.ErpStockIn; -import cn.qihangerp.module.stock.domain.ErpStockInItem; +import cn.qihangerp.model.entity.ErpStockIn; +import cn.qihangerp.model.entity.ErpStockInItem; import cn.qihangerp.module.stock.mapper.ErpStockInMapper; -import cn.qihangerp.module.stock.request.StockInCreateItem; -import cn.qihangerp.module.stock.request.StockInCreateRequest; -import cn.qihangerp.module.stock.request.StockInItem; -import cn.qihangerp.module.stock.request.StockInRequest; +import cn.qihangerp.model.request.StockInCreateItem; +import cn.qihangerp.model.request.StockInCreateRequest; +import cn.qihangerp.model.request.StockInItem; +import cn.qihangerp.model.request.StockInRequest; import cn.qihangerp.module.stock.service.ErpStockInItemService; import cn.qihangerp.module.stock.service.ErpStockInService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java index 653b7634..10d0c20a 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; +import cn.qihangerp.model.entity.ErpStockOutItemPosition; import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; import cn.qihangerp.module.stock.service.ErpStockOutItemPositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java index 6b61c983..b70b984a 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java @@ -12,11 +12,11 @@ import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.model.entity.ErpStockOut; import cn.qihangerp.model.entity.ErpStockOutItem; -import cn.qihangerp.module.stock.domain.ErpStockOutItemPosition; +import cn.qihangerp.model.entity.ErpStockOutItemPosition; import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; -import cn.qihangerp.module.stock.request.GoodsSkuInventoryVo; -import cn.qihangerp.module.stock.request.StockOutCreateRequest; -import cn.qihangerp.module.stock.request.StockOutItemRequest; +import cn.qihangerp.model.request.GoodsSkuInventoryVo; +import cn.qihangerp.model.request.StockOutCreateRequest; +import cn.qihangerp.model.request.StockOutItemRequest; import cn.qihangerp.module.stock.service.ErpStockOutItemService; import cn.qihangerp.module.stock.service.ErpStockOutService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java index aae74a6a..88f52372 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.ErpWarehousePosition; +import cn.qihangerp.model.entity.ErpWarehousePosition; import cn.qihangerp.module.stock.mapper.ErpWarehousePositionMapper; import cn.qihangerp.module.stock.service.ErpWarehousePositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java index f99530fa..6990959c 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.stock.service.impl; -import cn.qihangerp.module.stock.domain.ErpWarehouse; +import cn.qihangerp.model.entity.ErpWarehouse; import cn.qihangerp.module.stock.mapper.ErpWarehouseMapper; import cn.qihangerp.module.stock.service.ErpWarehouseService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml b/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml index a2928100..7d230b1b 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml b/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml index 55ed07bc..9d555922 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml b/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml index 7d69fa92..9a35fbd3 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml b/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml index 22905785..7b8241ce 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml b/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml index 081161c1..f918570f 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml b/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml index eaf15de9..9a338ad1 100644 --- a/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml +++ b/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java index 0f111c4b..2f6980d0 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoGoods; +import cn.qihangerp.model.entity.TaoGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_tao_goods(淘宝商品表)】的数据库操作Mapper * @createDate 2025-05-19 10:59:14 -* @Entity cn.qihangerp.module.open.tao.domain.TaoGoods +* @Entity cn.qihangerp.model.entity.TaoGoods */ public interface TaoGoodsMapper extends BaseMapper { diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java index 8223b625..1d002423 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.vo.TaoGoodsSkuListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java index ae4b7a62..9694796e 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.model.entity.TaoOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java index 59a51bdb..903cea62 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoOrder; +import cn.qihangerp.model.entity.TaoOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java index 5ec6e209..6e7eca3a 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; +import cn.qihangerp.model.entity.TaoOrderPromotion; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java index 1ad67e64..e1b7cfa3 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.mapper; -import cn.qihangerp.module.open.tao.domain.TaoRefund; +import cn.qihangerp.model.entity.TaoRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java index 14c0a328..912ce96c 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; +import cn.qihangerp.model.entity.TaoGoods; +import cn.qihangerp.model.bo.TaoGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java index c96bef79..998a8607 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.bo.TaoGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java index bdba1041..e3349818 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.service; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.model.entity.TaoOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java index 7fc636a3..f4551996 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.tao.service; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; +import cn.qihangerp.model.entity.TaoOrderPromotion; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java index 40d06422..438274cc 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java @@ -3,10 +3,9 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.common.bo.ShopOrderShipBo; -import cn.qihangerp.module.open.tao.domain.TaoOrder; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderConfirmBo; +import cn.qihangerp.model.entity.TaoOrder; +import cn.qihangerp.model.bo.TaoOrderBo; +import cn.qihangerp.model.bo.TaoOrderConfirmBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java index bab8e832..b58b9aaf 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java @@ -2,8 +2,8 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.open.tao.domain.TaoRefund; -import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; +import cn.qihangerp.model.entity.TaoRefund; +import cn.qihangerp.model.bo.TaoRefundBo; import com.baomidou.mybatisplus.extension.service.IService; 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 c57b9199..aa14c7ae 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 @@ -12,9 +12,9 @@ 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.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; +import cn.qihangerp.model.entity.TaoGoods; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsService; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java index 6fe9e98b..30177e2f 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; +import cn.qihangerp.model.entity.TaoGoods; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java index 7d9b7610..25909963 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.tao.service.impl; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.model.entity.TaoOrderItem; import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper; import cn.qihangerp.module.open.tao.service.TaoOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java index cdcc77bb..5ded19cc 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.tao.service.impl; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; +import cn.qihangerp.model.entity.TaoOrderPromotion; import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper; import cn.qihangerp.module.open.tao.service.TaoOrderPromotionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java index 0f028643..0d6cf933 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java @@ -5,19 +5,17 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.common.bo.ShopOrderShipBo; import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpOrderItemMapper; import cn.qihangerp.mapper.ErpOrderMapper; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.TaoOrder; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderConfirmBo; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.entity.TaoOrder; +import cn.qihangerp.model.entity.TaoOrderItem; +import cn.qihangerp.model.entity.TaoOrderPromotion; +import cn.qihangerp.model.bo.TaoOrderBo; +import cn.qihangerp.model.bo.TaoOrderConfirmBo; import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper; import cn.qihangerp.module.open.tao.mapper.TaoOrderMapper; import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java index ed169bee..222f8a0b 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java @@ -4,9 +4,9 @@ package cn.qihangerp.module.open.tao.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.TaoRefund; -import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; +import cn.qihangerp.model.entity.TaoGoodsSku; +import cn.qihangerp.model.entity.TaoRefund; +import cn.qihangerp.model.bo.TaoRefundBo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.mapper.TaoRefundMapper; import cn.qihangerp.module.open.tao.service.TaoRefundService; diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml index eb19cf66..064c00c6 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml index 5b55c2d9..bb89d031 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -38,7 +38,7 @@ create_time - SELECT sku.*,g.title,g.pic_url,ogs.outer_erp_sku_id,g.shop_id FROM oms_tao_goods_sku sku LEFT JOIN oms_tao_goods g on g.id = sku.tao_goods_id LEFT JOIN o_goods_sku ogs on ogs.id = sku.erp_goods_sku_id diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml index b431ea76..0cd6bbf4 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml index cb62f4b9..1330e83c 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml index b53c9131..77fa7b5f 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml b/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml index ad8e8270..9c7af426 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml +++ b/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java index 393e0e64..e6b2101b 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiGoods; +import cn.qihangerp.model.entity.WeiGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_wei_goods】的数据库操作Mapper * @createDate 2025-05-20 16:31:43 -* @Entity cn.qihangerp.module.open.wei.domain.WeiGoods +* @Entity cn.qihangerp.model.entity.WeiGoods */ public interface WeiGoodsMapper extends BaseMapper { diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java index 30cf96c1..db5c5b47 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_wei_goods_sku】的数据库操作Mapper * @createDate 2025-05-20 16:30:57 -* @Entity cn.qihangerp.module.open.wei.domain.WeiGoodsSku +* @Entity cn.qihangerp.model.entity.WeiGoodsSku */ public interface WeiGoodsSkuMapper extends BaseMapper { diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java index cc345ad1..1d356bef 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiOrderItem; +import cn.qihangerp.model.entity.WeiOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java index c832f462..915663b3 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiOrder; +import cn.qihangerp.model.entity.WeiOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java index 96808c5e..1de40eb4 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiRefund; +import cn.qihangerp.model.entity.WeiRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java index 12f0491f..e69d24f3 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.mapper; -import cn.qihangerp.module.open.wei.domain.WeiWaybillAccount; +import cn.qihangerp.model.entity.WeiWaybillAccount; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java index eba30a45..9a9451c8 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java @@ -3,8 +3,7 @@ package cn.qihangerp.module.open.wei.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.wei.domain.WeiGoods; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoods; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java index 6df47260..f6719560 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java @@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java index 2a6b0220..dca07563 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.service; -import cn.qihangerp.module.open.wei.domain.WeiOrderItem; +import cn.qihangerp.model.entity.WeiOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java index a4528108..15786fec 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java @@ -3,8 +3,8 @@ package cn.qihangerp.module.open.wei.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.wei.domain.WeiOrder; -import cn.qihangerp.module.open.wei.domain.bo.WeiOrderConfirmBo; +import cn.qihangerp.model.entity.WeiOrder; +import cn.qihangerp.model.bo.WeiOrderConfirmBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java index 37e546c1..4b7d1d7f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.open.wei.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.open.wei.domain.WeiRefund; +import cn.qihangerp.model.entity.WeiRefund; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java index 9b3d7bff..1c7c4b17 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.wei.service; -import cn.qihangerp.module.open.wei.domain.WeiWaybillAccount; +import cn.qihangerp.model.entity.WeiWaybillAccount; import com.baomidou.mybatisplus.extension.service.IService; 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 0bb14b58..857d7e9a 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 @@ -11,8 +11,8 @@ 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.module.open.wei.domain.WeiGoods; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoods; +import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.service.WeiGoodsService; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java index 323c784d..844c86f3 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java @@ -8,8 +8,8 @@ import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.wei.domain.WeiGoods; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiGoods; +import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.service.WeiGoodsSkuService; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java index b775a910..3c69206f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.open.wei.service.impl; import cn.qihangerp.module.open.wei.service.WeiOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.open.wei.domain.WeiOrderItem; +import cn.qihangerp.model.entity.WeiOrderItem; import cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java index ffa3918d..f378dc08 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java @@ -5,15 +5,14 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpOrderItemMapper; import cn.qihangerp.mapper.ErpOrderMapper; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; -import cn.qihangerp.module.open.wei.domain.WeiOrder; -import cn.qihangerp.module.open.wei.domain.WeiOrderItem; -import cn.qihangerp.module.open.wei.domain.bo.WeiOrderConfirmBo; +import cn.qihangerp.model.entity.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiOrder; +import cn.qihangerp.model.entity.WeiOrderItem; +import cn.qihangerp.model.bo.WeiOrderConfirmBo; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper; import cn.qihangerp.module.open.wei.mapper.WeiOrderMapper; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java index c2ddbf48..52e10879 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.open.wei.domain.WeiGoodsSku; -import cn.qihangerp.module.open.wei.domain.WeiRefund; +import cn.qihangerp.model.entity.WeiGoodsSku; +import cn.qihangerp.model.entity.WeiRefund; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper; import cn.qihangerp.module.open.wei.mapper.WeiRefundMapper; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java index 1459127b..5a4f4e85 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.wei.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.open.wei.domain.WeiWaybillAccount; +import cn.qihangerp.model.entity.WeiWaybillAccount; import cn.qihangerp.module.open.wei.service.WeiWaybillAccountService; import cn.qihangerp.module.open.wei.mapper.WeiWaybillAccountMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml index 4017cb11..34d0850e 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml index 1e221c35..2361baf3 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml index 86de4573..a937cf17 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml index 10c76c0e..3621db94 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml index e5014ae8..64266148 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml b/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml index 472c11b8..d5e9dc29 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml +++ b/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +