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 564e7bec..b046d2ed 100644 Binary files a/docs/preview.png and b/docs/preview.png differ 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"> - +