优化精简项目结构

api/erp-api/pom.xml

@@ -89,11 +89,11 @@
 <!--            <artifactId>order</artifactId>-->
 <!--            <version>1.0</version>-->
 <!--        </dependency>-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>cn.qihangerp.service</groupId>
+<!--            <groupId>cn.qihangerp.service</groupId>-->
-            <artifactId>stock</artifactId>
+<!--            <artifactId>stock</artifactId>-->
-            <version>2.0.0</version>
+<!--            <version>2.0.0</version>-->
-        </dependency>
+<!--        </dependency>-->
 
 <!--        <dependency>-->
 <!--            <groupId>cn.qihangerp.services</groupId>-->

api/oms-api/pom.xml

@@ -106,6 +106,11 @@
             <artifactId>jackson-mapper-asl</artifactId>
             <version>1.9.13</version> <!-- jd-sdk依赖 -->
         </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.service</groupId>
+            <artifactId>service</artifactId>
+            <version>2.0.0</version>
+        </dependency>
 <!--        <dependency>-->
 <!--            <groupId>org.projectlombok</groupId>-->
 <!--            <artifactId>lombok</artifactId>-->
@@ -137,21 +142,21 @@
 <!--            <artifactId>dou-api</artifactId>-->
 <!--            <version>1.0.6</version>-->
 <!--        </dependency>-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>cn.qihangerp.service</groupId>
+<!--            <groupId>cn.qihangerp.service</groupId>-->
-            <artifactId>tao</artifactId>
+<!--            <artifactId>tao</artifactId>-->
-            <version>2.0.0</version>
+<!--            <version>2.0.0</version>-->
-        </dependency>
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>cn.qihangerp.services</groupId>-->
 <!--            <artifactId>tao-api</artifactId>-->
 <!--            <version>1.0.6</version>-->
 <!--        </dependency>-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>cn.qihangerp.service</groupId>
+<!--            <groupId>cn.qihangerp.service</groupId>-->
-            <artifactId>pdd</artifactId>
+<!--            <artifactId>pdd</artifactId>-->
-            <version>2.0.0</version>
+<!--            <version>2.0.0</version>-->
-        </dependency>
+<!--        </dependency>-->
 <!--        <dependency>-->
 <!--            <groupId>cn.qihangerp.services</groupId>-->
 <!--            <artifactId>pdd-api</artifactId>-->
@@ -162,11 +167,11 @@
 <!--            <artifactId>wei-api</artifactId>-->
 <!--            <version>1.0.6</version>-->
 <!--        </dependency>-->
-        <dependency>
+<!--        <dependency>-->
-            <groupId>cn.qihangerp.service</groupId>
+<!--            <groupId>cn.qihangerp.service</groupId>-->
-            <artifactId>wei</artifactId>
+<!--            <artifactId>wei</artifactId>-->
-            <version>2.0.0</version>
+<!--            <version>2.0.0</version>-->
-        </dependency>
+<!--        </dependency>-->
     </dependencies>
 <!--    <dependencyManagement>-->
 <!--        <dependencies>-->

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java

@@ -6,7 +6,7 @@ import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.JdGoodsSku;
-import cn.qihangerp.module.open.jd.service.JdGoodsService;
+import cn.qihangerp.module.service.JdGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.oms.jd.JdApiCommon;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java

@@ -1,14 +1,13 @@
 package cn.qihangerp.oms.jd.controller;
 
-
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
-import cn.qihangerp.module.service.OGoodsSkuService;
 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.service.JdGoodsService;
-import cn.qihangerp.module.open.jd.service.JdGoodsSkuService;
+import cn.qihangerp.module.service.JdGoodsSkuService;
+import cn.qihangerp.module.service.OGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java

@@ -11,7 +11,7 @@ import cn.qihangerp.common.utils.DateUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.JdRefund;
-import cn.qihangerp.module.open.jd.service.JdRefundService;
+import cn.qihangerp.module.service.JdRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.oms.jd.JdApiCommon;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java

@@ -1,6 +1,5 @@
 package cn.qihangerp.oms.jd.controller;
 
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,8 +11,8 @@ import cn.qihangerp.common.mq.MqUtils;
 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.service.JdOrderService;
-import cn.qihangerp.module.open.jd.service.JdRefundService;
+import cn.qihangerp.module.service.JdRefundService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java

@@ -11,7 +11,7 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 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.JdOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
 import cn.qihangerp.oms.jd.JdApiCommon;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java

@@ -1,6 +1,5 @@
 package cn.qihangerp.oms.jd.controller;
 
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,7 +11,7 @@ import cn.qihangerp.common.mq.MqUtils;
 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.module.service.JdOrderService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.JdOrder;
-import cn.qihangerp.module.open.jd.service.JdOrderService;
+import cn.qihangerp.module.service.JdOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.jd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.JdRefund;
-import cn.qihangerp.module.open.jd.service.JdRefundService;
+import cn.qihangerp.module.service.JdRefundService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java

@@ -9,9 +9,9 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.PddOrder;
 import cn.qihangerp.model.entity.PddOrderItem;
-import cn.qihangerp.module.open.pdd.service.PddOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.module.service.PddOrderService;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddOrderApiHelper;
 import cn.qihangerp.open.pdd.model.OrderListResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.pdd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.PddOrder;
-import cn.qihangerp.module.open.pdd.service.PddOrderService;
+import cn.qihangerp.module.service.PddOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java

@@ -7,9 +7,9 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.PddGoods;
 import cn.qihangerp.model.entity.PddGoodsSku;
-import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.module.service.PddGoodsService;
 import cn.qihangerp.oms.pdd.PddApiCommon;
 import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java

@@ -1,14 +1,13 @@
 package cn.qihangerp.oms.pdd.controller;
 
-
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.service.OGoodsSkuService;
 import cn.qihangerp.model.entity.PddGoods;
 import cn.qihangerp.model.entity.PddGoodsSku;
 import cn.qihangerp.model.bo.PddGoodsBo;
-import cn.qihangerp.module.open.pdd.service.PddGoodsService;
+import cn.qihangerp.module.service.PddGoodsService;
-import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;
+import cn.qihangerp.module.service.PddGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java

@@ -10,9 +10,9 @@ import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.PddOrder;
 import cn.qihangerp.model.entity.PddOrderItem;
-import cn.qihangerp.module.open.pdd.service.PddOrderService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.module.service.PddOrderService;
 import cn.qihangerp.oms.pdd.PddApiCommon;
 import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java

@@ -13,7 +13,7 @@ import cn.qihangerp.model.entity.PddOrder;
 import cn.qihangerp.model.bo.PddOrderBo;
 import cn.qihangerp.model.bo.PddOrderConfirmBo;
 import cn.qihangerp.model.bo.PddOrderPushBo;
-import cn.qihangerp.module.open.pdd.service.PddOrderService;
+import cn.qihangerp.module.service.PddOrderService;
 import cn.qihangerp.security.common.BaseController;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.AllArgsConstructor;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java

@@ -10,9 +10,9 @@ import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 import cn.qihangerp.model.entity.PddRefund;
-import cn.qihangerp.module.open.pdd.service.PddRefundService;
 import cn.qihangerp.module.service.OShopPullLasttimeService;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.module.service.PddRefundService;
 import cn.qihangerp.oms.pdd.PddApiCommon;
 import cn.qihangerp.oms.pdd.PddPullRequest;
 import cn.qihangerp.open.common.ApiResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java

@@ -1,6 +1,5 @@
 package cn.qihangerp.oms.pdd.controller;
 
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,7 +11,7 @@ import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.PddRefund;
 import cn.qihangerp.model.bo.PddOrderPushBo;
 import cn.qihangerp.model.bo.PddRefundBo;
-import cn.qihangerp.module.open.pdd.service.PddRefundService;
+import cn.qihangerp.module.service.PddRefundService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.pdd.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.PddRefund;
-import cn.qihangerp.module.open.pdd.service.PddRefundService;
+import cn.qihangerp.module.service.PddRefundService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java

@@ -11,10 +11,9 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 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;
 import cn.qihangerp.module.service.OShopPullLogsService;
+import cn.qihangerp.module.service.TaoGoodsService;
 import cn.qihangerp.oms.tao.TaoApiCommon;
 import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java

@@ -1,14 +1,13 @@
 package cn.qihangerp.oms.tao.controller;
 
-
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.service.OGoodsSkuService;
 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.service.TaoGoodsService;
-import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService;
+import cn.qihangerp.module.service.TaoGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java

@@ -10,16 +10,14 @@ import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 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;
+import cn.qihangerp.module.service.TaoOrderService;
 import cn.qihangerp.oms.tao.OrderAssembleHelper;
 import cn.qihangerp.oms.tao.TaoApiCommon;
 import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;
-
 import cn.qihangerp.open.tao.TaoOrderApiHelper;
-
 import cn.qihangerp.open.tao.response.TaoOrderDetailResponse;
 import cn.qihangerp.open.tao.response.TaoOrderListResponse;
 import lombok.AllArgsConstructor;
@@ -27,7 +25,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
-
 import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java

@@ -12,7 +12,7 @@ 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.module.service.TaoOrderService;
 import cn.qihangerp.security.common.BaseController;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.AllArgsConstructor;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.TaoOrder;
-import cn.qihangerp.module.open.tao.service.TaoOrderService;
+import cn.qihangerp.module.service.TaoOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java

@@ -10,9 +10,9 @@ import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.OShopPullLasttime;
 import cn.qihangerp.model.entity.OShopPullLogs;
 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;
+import cn.qihangerp.module.service.TaoRefundService;
 import cn.qihangerp.oms.tao.TaoApiCommon;
 import cn.qihangerp.oms.tao.TaoRequest;
 import cn.qihangerp.open.common.ApiResultVo;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java

@@ -1,6 +1,5 @@
 package cn.qihangerp.oms.tao.controller;
 
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,7 +11,7 @@ import cn.qihangerp.common.mq.MqUtils;
 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.module.service.TaoRefundService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.tao.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.TaoRefund;
-import cn.qihangerp.module.open.tao.service.TaoRefundService;
+import cn.qihangerp.module.service.TaoRefundService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java

@@ -3,14 +3,12 @@ package cn.qihangerp.oms.wei.controller;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
-
 import cn.qihangerp.model.entity.WeiGoods;
 import cn.qihangerp.model.entity.WeiGoodsSku;
-import cn.qihangerp.module.open.wei.service.WeiGoodsService;
+import cn.qihangerp.module.service.WeiGoodsService;
 import cn.qihangerp.oms.wei.PullRequest;
 import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
-
 import cn.qihangerp.open.wei.WeiGoodsApiService;
 import cn.qihangerp.open.wei.model.Product;
 import com.alibaba.fastjson2.JSONObject;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java

@@ -1,13 +1,12 @@
 package cn.qihangerp.oms.wei.controller;
 
-
 import cn.qihangerp.common.*;
 import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
 import cn.qihangerp.module.service.OGoodsSkuService;
 import cn.qihangerp.model.entity.WeiGoods;
 import cn.qihangerp.model.entity.WeiGoodsSku;
-import cn.qihangerp.module.open.wei.service.WeiGoodsService;
+import cn.qihangerp.module.service.WeiGoodsService;
-import cn.qihangerp.module.open.wei.service.WeiGoodsSkuService;
+import cn.qihangerp.module.service.WeiGoodsSkuService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java

@@ -5,12 +5,10 @@ import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.WeiOrder;
 import cn.qihangerp.model.entity.WeiOrderItem;
-import cn.qihangerp.module.open.wei.service.WeiOrderService;
+import cn.qihangerp.module.service.WeiOrderService;
-
 import cn.qihangerp.oms.wei.PullRequest;
 import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
-
 import cn.qihangerp.open.wei.WeiOrderApiHelper;
 import cn.qihangerp.open.wei.model.Order;
 import cn.qihangerp.open.wei.model.OrderDetailDeliverInfoAddress;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java

@@ -1,6 +1,5 @@
 package cn.qihangerp.oms.wei.controller;
 
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,7 +11,7 @@ import cn.qihangerp.common.mq.MqUtils;
 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.module.service.WeiOrderService;
 import cn.qihangerp.security.common.BaseController;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.AllArgsConstructor;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.wei.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.WeiOrder;
-import cn.qihangerp.module.open.wei.service.WeiOrderService;
+import cn.qihangerp.module.service.WeiOrderService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java

@@ -4,12 +4,10 @@ import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.HttpStatus;
 import cn.qihangerp.model.entity.WeiRefund;
-import cn.qihangerp.module.open.wei.service.WeiRefundService;
+import cn.qihangerp.module.service.WeiRefundService;
-
 import cn.qihangerp.oms.wei.PullRequest;
 import cn.qihangerp.oms.wei.WeiApiCommon;
 import cn.qihangerp.open.common.ApiResultVo;
-
 import cn.qihangerp.open.wei.WeiRefundApiHelper;
 import cn.qihangerp.open.wei.model.AfterSaleOrder;
 import cn.qihangerp.security.common.BaseController;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java

@@ -1,7 +1,5 @@
 package cn.qihangerp.oms.wei.controller;
 
-
-
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
@@ -12,7 +10,7 @@ import cn.qihangerp.common.mq.MqType;
 import cn.qihangerp.common.mq.MqUtils;
 import cn.qihangerp.model.entity.WeiRefund;
 import cn.qihangerp.model.bo.WeiOrderPushBo;
-import cn.qihangerp.module.open.wei.service.WeiRefundService;
+import cn.qihangerp.module.service.WeiRefundService;
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;

api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java

@@ -2,7 +2,7 @@ package cn.qihangerp.oms.wei.controller;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.model.entity.WeiRefund;
-import cn.qihangerp.module.open.wei.service.WeiRefundService;
+import cn.qihangerp.module.service.WeiRefundService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;

mapper/src/main/java/cn/qihangerp/mapper/ErpStockInItemMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ErpStockInItem;

mapper/src/main/java/cn/qihangerp/mapper/ErpStockInMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ErpStockIn;

mapper/src/main/java/cn/qihangerp/mapper/ErpStockOutItemPositionMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ErpStockOutItemPosition;

mapper/src/main/java/cn/qihangerp/mapper/ErpWarehouseMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ErpWarehouse;

mapper/src/main/java/cn/qihangerp/mapper/ErpWarehousePositionMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.ErpWarehousePosition;

mapper/src/main/java/cn/qihangerp/mapper/PddGoodsMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.PddGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/PddGoodsSkuMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.PddGoodsSku;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/PddOrderItemMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.PddOrderItem;

mapper/src/main/java/cn/qihangerp/mapper/PddOrderMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.PddOrder;

mapper/src/main/java/cn/qihangerp/mapper/PddRefundMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.PddRefund;

mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.TaoGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsSkuMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.TaoGoodsSku;
 import cn.qihangerp.model.vo.TaoGoodsSkuListVo;

mapper/src/main/java/cn/qihangerp/mapper/TaoOrderItemMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.TaoOrderItem;

mapper/src/main/java/cn/qihangerp/mapper/TaoOrderMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.TaoOrder;

mapper/src/main/java/cn/qihangerp/mapper/TaoOrderPromotionMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.TaoOrderPromotion;

mapper/src/main/java/cn/qihangerp/mapper/TaoRefundMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.TaoRefund;

mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiGoods;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsSkuMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiGoodsSku;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WeiOrderItemMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiOrderItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WeiOrderMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiOrder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WeiRefundMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiRefund;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WeiWaybillAccountMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.wei.mapper;
+package cn.qihangerp.mapper;
 
 import cn.qihangerp.model.entity.WeiWaybillAccount;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

mapper/src/main/java/cn/qihangerp/mapper/WmsInventoryOperationMapper.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.mapper;
+package cn.qihangerp.mapper;
 
 
 import cn.qihangerp.model.entity.WmsInventoryOperation;

mapper/src/main/resources/mapper/ErpStockInItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.ErpStockInItemMapper">
+<mapper namespace="cn.qihangerp.mapper.ErpStockInItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpStockInItem">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/ErpStockInMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.ErpStockInMapper">
+<mapper namespace="cn.qihangerp.mapper.ErpStockInMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpStockIn">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper">
+<mapper namespace="cn.qihangerp.mapper.ErpStockOutItemPositionMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpStockOutItemPosition">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/ErpWarehouseMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.ErpWarehouseMapper">
+<mapper namespace="cn.qihangerp.mapper.ErpWarehouseMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpWarehouse">
             <id property="id" column="id" jdbcType="INTEGER"/>

mapper/src/main/resources/mapper/ErpWarehousePositionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.ErpWarehousePositionMapper">
+<mapper namespace="cn.qihangerp.mapper.ErpWarehousePositionMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.ErpWarehousePosition">
             <id property="id" column="id" jdbcType="INTEGER"/>

mapper/src/main/resources/mapper/PddGoodsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper">
+<mapper namespace="cn.qihangerp.mapper.PddGoodsMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddGoods">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/PddGoodsSkuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper">
+<mapper namespace="cn.qihangerp.mapper.PddGoodsSkuMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddGoodsSku">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/PddOrderItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper">
+<mapper namespace="cn.qihangerp.mapper.PddOrderItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/PddOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderMapper">
+<mapper namespace="cn.qihangerp.mapper.PddOrderMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/PddRefundMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddRefundMapper">
+<mapper namespace="cn.qihangerp.mapper.PddRefundMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddRefund">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoGoodsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoGoodsMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoGoods">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoGoodsSkuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoGoodsSkuMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoGoodsSku">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoOrderItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoOrderItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoOrderMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoOrderMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoOrderPromotionMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoOrderPromotionMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoOrderPromotion">
             <result property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/TaoRefundMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.tao.mapper.TaoRefundMapper">
+<mapper namespace="cn.qihangerp.mapper.TaoRefundMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.TaoRefund">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiGoodsMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiGoodsMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiGoods">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiGoodsSkuMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiGoodsSkuMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiGoodsSku">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiOrderItemMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiOrderItemMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiOrderItem">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiOrderMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiOrderMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiOrderMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiOrder">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiRefundMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiRefundMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiRefundMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiRefund">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WeiWaybillAccountMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.open.wei.mapper.WeiWaybillAccountMapper">
+<mapper namespace="cn.qihangerp.mapper.WeiWaybillAccountMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WeiWaybillAccount">
             <id property="id" column="id" jdbcType="BIGINT"/>

mapper/src/main/resources/mapper/WmsInventoryOperationMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.qihangerp.module.stock.mapper.WmsInventoryOperationMapper">
+<mapper namespace="cn.qihangerp.mapper.WmsInventoryOperationMapper">
 
     <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.WmsInventoryOperation">
             <id property="id" column="id" jdbcType="BIGINT"/>

service/src/main/java/cn/qihangerp/module/service/ErpInventoryOperationService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.model.entity.WmsInventoryOperation;
 import com.baomidou.mybatisplus.extension.service.IService;

service/src/main/java/cn/qihangerp/module/service/ErpStockInItemService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.ErpStockInItem;

service/src/main/java/cn/qihangerp/module/service/ErpStockInService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.common.PageQuery;

service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemPositionService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.ErpStockOutItemPosition;

service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.ErpStockOutItem;

service/src/main/java/cn/qihangerp/module/service/ErpStockOutService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.common.PageQuery;

service/src/main/java/cn/qihangerp/module/service/ErpWarehousePositionService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.ErpWarehousePosition;

service/src/main/java/cn/qihangerp/module/service/ErpWarehouseService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.stock.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.ErpWarehouse;

service/src/main/java/cn/qihangerp/module/service/PddGoodsService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/PddOrderItemService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.PddOrderItem;

service/src/main/java/cn/qihangerp/module/service/PddOrderService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/PddRefundService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.pdd.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/TaoGoodsService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/TaoGoodsSkuService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/TaoOrderItemService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.TaoOrderItem;

service/src/main/java/cn/qihangerp/module/service/TaoOrderPromotionService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 
 import cn.qihangerp.model.entity.TaoOrderPromotion;

service/src/main/java/cn/qihangerp/module/service/TaoOrderService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;

service/src/main/java/cn/qihangerp/module/service/TaoRefundService.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.module.open.tao.service;
+package cn.qihangerp.module.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;