diff --git a/api/erp-api/pom.xml b/api/erp-api/pom.xml index d54c8066..30a4b2c8 100644 --- a/api/erp-api/pom.xml +++ b/api/erp-api/pom.xml @@ -89,11 +89,11 @@ - - cn.qihangerp.service - stock - 2.0.0 - + + + + + diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 7b866e7d..6b33a44e 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -106,6 +106,11 @@ jackson-mapper-asl 1.9.13 + + cn.qihangerp.service + service + 2.0.0 + @@ -137,21 +142,21 @@ - - cn.qihangerp.service - tao - 2.0.0 - + + + + + - - cn.qihangerp.service - pdd - 2.0.0 - + + + + + @@ -162,11 +167,11 @@ - - cn.qihangerp.service - wei - 2.0.0 - + + + + + diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java index fb4f2fae..55cccbde 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java index 2496b885..281d0f68 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java +++ b/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.open.jd.service.JdGoodsSkuService; +import cn.qihangerp.module.service.JdGoodsService; +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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java index 8ebb16d3..79fb6a5a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java index 975fc172..9851d271 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderAfterSaleController.java +++ b/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.open.jd.service.JdRefundService; +import cn.qihangerp.module.service.JdOrderService; +import cn.qihangerp.module.service.JdRefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java index 5e381c8c..1a347135 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java index fe5cf372..eeee63fb 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderController.java +++ b/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.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java index 7e9d9f7c..e3b4f2b2 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdOrderFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java index 160ee524..3e8b3d3a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdRefundFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java index 136943e1..4a5ed6a6 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/PddOrderApiService.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java index 554c0478..afacd843 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/OrderFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java index d65371f1..23337bd4 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java index 1911df8f..25f6d2d5 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java +++ b/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.open.pdd.service.PddGoodsSkuService; +import cn.qihangerp.module.service.PddGoodsService; +import cn.qihangerp.module.service.PddGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java index c5592134..639dce5d 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java index eda20631..50504355 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddOrderController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java index aaa8e448..49235ae5 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java index 43abc68a..f52d1a42 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddRefundController.java +++ b/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.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java index 27bbc25d..c785adc1 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/RefundFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java index 99d323bf..c2f31c95 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java index a140ddec..0d199c39 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java +++ b/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.open.tao.service.TaoGoodsSkuService; +import cn.qihangerp.module.service.TaoGoodsService; +import cn.qihangerp.module.service.TaoGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java index e949f792..0472769b 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java index e19fbb92..9ec763a6 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java index 0b65cbf7..d6baabcc 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoOrderFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java index fafa3f0c..395a0227 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java index e489f92d..ac70e35e 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundController.java +++ b/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.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java index df0211ed..5223efb6 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoRefundFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java index f108b834..4e075d2a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/GoodsApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java index 48761e77..4202325b 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java +++ b/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.open.wei.service.WeiGoodsSkuService; +import cn.qihangerp.module.service.WeiGoodsService; +import cn.qihangerp.module.service.WeiGoodsSkuService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java index e566a7c7..a1dc9b1d 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java index 665a274a..1c5f72bb 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java index 84af4dc3..dbac6721 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiOrderFeignController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java index 2a35a1f7..c70647fa 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundApiController.java +++ b/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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java index 43efc532..26c76f98 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundController.java +++ b/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.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java index bec37cd2..bdf5ad6a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiRefundFeignController.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpStockInItemMapper.java similarity index 90% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpStockInItemMapper.java index 8adc473f..af1a4cb4 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInItemMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpStockInMapper.java similarity index 89% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpStockInMapper.java index 52c55927..cec13854 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockInMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpStockOutItemPositionMapper.java similarity index 91% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpStockOutItemPositionMapper.java index d1afbddc..14a99ec9 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpStockOutItemPositionMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpWarehouseMapper.java similarity index 89% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpWarehouseMapper.java index afc4b11f..76324573 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehouseMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/ErpWarehousePositionMapper.java similarity index 90% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/ErpWarehousePositionMapper.java index 1cb4faa2..5352ac37 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/ErpWarehousePositionMapper.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/PddGoodsMapper.java similarity index 88% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/PddGoodsMapper.java index fca059a8..8ee27060 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/PddGoodsSkuMapper.java similarity index 89% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/PddGoodsSkuMapper.java index 5850bcef..9e7a6a46 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/PddOrderItemMapper.java similarity index 89% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/PddOrderItemMapper.java index a9fe2c80..44db4ab9 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/PddOrderMapper.java similarity index 88% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/PddOrderMapper.java index b6a17ad4..4ec5eabe 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/PddRefundMapper.java similarity index 88% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/PddRefundMapper.java index 35e3fd76..a938ec23 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsMapper.java similarity index 88% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsMapper.java index 2f6980d0..d13bcbb2 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsSkuMapper.java similarity index 95% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoGoodsSkuMapper.java index 1d002423..313965d6 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoOrderItemMapper.java similarity index 89% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoOrderItemMapper.java index 9694796e..26633888 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoOrderMapper.java similarity index 88% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoOrderMapper.java index 903cea62..ebd28cf2 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoOrderPromotionMapper.java similarity index 89% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoOrderPromotionMapper.java index 6e7eca3a..8c5942c2 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/TaoRefundMapper.java similarity index 88% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/TaoRefundMapper.java index e1b7cfa3..208cd5a3 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsMapper.java similarity index 88% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsMapper.java index e6b2101b..2e0d5d50 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsSkuMapper.java similarity index 88% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiGoodsSkuMapper.java index db5c5b47..1684f80d 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiGoodsSkuMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiOrderItemMapper.java similarity index 88% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiOrderItemMapper.java index 1d356bef..794f960f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderItemMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiOrderMapper.java similarity index 88% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiOrderMapper.java index 915663b3..a250778c 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiOrderMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiRefundMapper.java similarity index 89% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiRefundMapper.java index 1de40eb4..86a91e8f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiRefundMapper.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WeiWaybillAccountMapper.java similarity index 90% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WeiWaybillAccountMapper.java index e69d24f3..2f3af4d4 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/mapper/WeiWaybillAccountMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/WmsInventoryOperationMapper.java similarity index 91% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/WmsInventoryOperationMapper.java index 0b2c3406..ed2e0edf 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/mapper/WmsInventoryOperationMapper.java +++ b/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; diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml b/mapper/src/main/resources/mapper/ErpStockInItemMapper.xml similarity index 96% rename from serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml rename to mapper/src/main/resources/mapper/ErpStockInItemMapper.xml index 7d230b1b..83b31f62 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockInItemMapper.xml +++ b/mapper/src/main/resources/mapper/ErpStockInItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml b/mapper/src/main/resources/mapper/ErpStockInMapper.xml similarity index 96% rename from serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml rename to mapper/src/main/resources/mapper/ErpStockInMapper.xml index 9d555922..275bafef 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockInMapper.xml +++ b/mapper/src/main/resources/mapper/ErpStockInMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml b/mapper/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml similarity index 94% rename from serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml rename to mapper/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml index 9a35fbd3..7606b608 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml +++ b/mapper/src/main/resources/mapper/ErpStockOutItemPositionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml b/mapper/src/main/resources/mapper/ErpWarehouseMapper.xml similarity index 95% rename from serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml rename to mapper/src/main/resources/mapper/ErpWarehouseMapper.xml index 7b8241ce..cca6942c 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpWarehouseMapper.xml +++ b/mapper/src/main/resources/mapper/ErpWarehouseMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml b/mapper/src/main/resources/mapper/ErpWarehousePositionMapper.xml similarity index 95% rename from serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml rename to mapper/src/main/resources/mapper/ErpWarehousePositionMapper.xml index f918570f..acc70f8e 100644 --- a/serviceImpl/stock/src/main/resources/mapper/ErpWarehousePositionMapper.xml +++ b/mapper/src/main/resources/mapper/ErpWarehousePositionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml b/mapper/src/main/resources/mapper/PddGoodsMapper.xml similarity index 95% rename from serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml rename to mapper/src/main/resources/mapper/PddGoodsMapper.xml index a1967fc6..fa4f9655 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/PddGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/PddGoodsSkuMapper.xml similarity index 96% rename from serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/PddGoodsSkuMapper.xml index 5efa13b1..7500d711 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/PddGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml b/mapper/src/main/resources/mapper/PddOrderItemMapper.xml similarity index 95% rename from serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml rename to mapper/src/main/resources/mapper/PddOrderItemMapper.xml index b029e4c3..59031329 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/PddOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml b/mapper/src/main/resources/mapper/PddOrderMapper.xml similarity index 99% rename from serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml rename to mapper/src/main/resources/mapper/PddOrderMapper.xml index 3772e29f..d99cb9b1 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml +++ b/mapper/src/main/resources/mapper/PddOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml b/mapper/src/main/resources/mapper/PddRefundMapper.xml similarity index 98% rename from serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml rename to mapper/src/main/resources/mapper/PddRefundMapper.xml index 1cb61f62..214685df 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml +++ b/mapper/src/main/resources/mapper/PddRefundMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml b/mapper/src/main/resources/mapper/TaoGoodsMapper.xml similarity index 97% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml rename to mapper/src/main/resources/mapper/TaoGoodsMapper.xml index 064c00c6..44c2ab81 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/TaoGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/TaoGoodsSkuMapper.xml similarity index 97% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/TaoGoodsSkuMapper.xml index e3bb64ed..3102c3ef 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/TaoGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml b/mapper/src/main/resources/mapper/TaoOrderItemMapper.xml similarity index 98% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml rename to mapper/src/main/resources/mapper/TaoOrderItemMapper.xml index f710affc..ed53db83 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/TaoOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml b/mapper/src/main/resources/mapper/TaoOrderMapper.xml similarity index 99% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml rename to mapper/src/main/resources/mapper/TaoOrderMapper.xml index 1330e83c..138d2bea 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml +++ b/mapper/src/main/resources/mapper/TaoOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml b/mapper/src/main/resources/mapper/TaoOrderPromotionMapper.xml similarity index 94% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml rename to mapper/src/main/resources/mapper/TaoOrderPromotionMapper.xml index 77fa7b5f..0ab18270 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml +++ b/mapper/src/main/resources/mapper/TaoOrderPromotionMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml b/mapper/src/main/resources/mapper/TaoRefundMapper.xml similarity index 98% rename from serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml rename to mapper/src/main/resources/mapper/TaoRefundMapper.xml index 9c7af426..297d26fe 100644 --- a/serviceImpl/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml +++ b/mapper/src/main/resources/mapper/TaoRefundMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml b/mapper/src/main/resources/mapper/WeiGoodsMapper.xml similarity index 96% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml rename to mapper/src/main/resources/mapper/WeiGoodsMapper.xml index 34d0850e..b19f04aa 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/WeiGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/WeiGoodsSkuMapper.xml similarity index 96% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/WeiGoodsSkuMapper.xml index 2361baf3..54409236 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/WeiGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml b/mapper/src/main/resources/mapper/WeiOrderItemMapper.xml similarity index 97% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml rename to mapper/src/main/resources/mapper/WeiOrderItemMapper.xml index 143cdab6..660d5a75 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/WeiOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml b/mapper/src/main/resources/mapper/WeiOrderMapper.xml similarity index 98% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml rename to mapper/src/main/resources/mapper/WeiOrderMapper.xml index 3621db94..9bf73f00 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiOrderMapper.xml +++ b/mapper/src/main/resources/mapper/WeiOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml b/mapper/src/main/resources/mapper/WeiRefundMapper.xml similarity index 97% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml rename to mapper/src/main/resources/mapper/WeiRefundMapper.xml index 64266148..8e5048a5 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiRefundMapper.xml +++ b/mapper/src/main/resources/mapper/WeiRefundMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml b/mapper/src/main/resources/mapper/WeiWaybillAccountMapper.xml similarity index 97% rename from serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml rename to mapper/src/main/resources/mapper/WeiWaybillAccountMapper.xml index d5e9dc29..60e4994a 100644 --- a/serviceImpl/wei/src/main/resources/mapper/wei/WeiWaybillAccountMapper.xml +++ b/mapper/src/main/resources/mapper/WeiWaybillAccountMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml b/mapper/src/main/resources/mapper/WmsInventoryOperationMapper.xml similarity index 96% rename from serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml rename to mapper/src/main/resources/mapper/WmsInventoryOperationMapper.xml index 9a338ad1..bf0ead08 100644 --- a/serviceImpl/stock/src/main/resources/mapper/WmsInventoryOperationMapper.xml +++ b/mapper/src/main/resources/mapper/WmsInventoryOperationMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java b/service/src/main/java/cn/qihangerp/module/service/ErpInventoryOperationService.java similarity index 89% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpInventoryOperationService.java index 75cb9859..99521210 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpInventoryOperationService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java b/service/src/main/java/cn/qihangerp/module/service/ErpStockInItemService.java similarity index 88% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpStockInItemService.java index 38e001d4..0995c14e 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInItemService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java b/service/src/main/java/cn/qihangerp/module/service/ErpStockInService.java similarity index 95% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpStockInService.java index 36d6934c..90f7ea79 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockInService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java b/service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemPositionService.java similarity index 89% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemPositionService.java index 4955249f..d769084f 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemPositionService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java b/service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemService.java similarity index 88% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpStockOutItemService.java index 6760b2e4..f4058677 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutItemService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java b/service/src/main/java/cn/qihangerp/module/service/ErpStockOutService.java similarity index 95% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpStockOutService.java index c2020a2d..8d590bf7 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpStockOutService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java b/service/src/main/java/cn/qihangerp/module/service/ErpWarehousePositionService.java similarity index 89% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpWarehousePositionService.java index edb3c101..ee04d7bc 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehousePositionService.java +++ b/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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java b/service/src/main/java/cn/qihangerp/module/service/ErpWarehouseService.java similarity index 88% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java rename to service/src/main/java/cn/qihangerp/module/service/ErpWarehouseService.java index d1c707a0..b5dd6fb9 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/ErpWarehouseService.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/PddGoodsService.java similarity index 93% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/PddGoodsService.java index 4bcccdca..b26ba3a6 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java similarity index 93% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/PddGoodsSkuService.java index ea7b0be3..97ade992 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/PddOrderItemService.java similarity index 87% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/PddOrderItemService.java index 7ef41247..e1079023 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java b/service/src/main/java/cn/qihangerp/module/service/PddOrderService.java similarity index 95% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/PddOrderService.java index c3a0e493..fa627201 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java +++ b/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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java b/service/src/main/java/cn/qihangerp/module/service/PddRefundService.java similarity index 93% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/PddRefundService.java index f427c10f..d257675c 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/TaoGoodsService.java similarity index 93% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoGoodsService.java index 912ce96c..b04f1d34 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/TaoGoodsSkuService.java similarity index 93% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoGoodsSkuService.java index 998a8607..65d586e5 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/TaoOrderItemService.java similarity index 87% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoOrderItemService.java index e3349818..0dffcf6c 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java b/service/src/main/java/cn/qihangerp/module/service/TaoOrderPromotionService.java similarity index 88% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoOrderPromotionService.java index f4551996..a2ea6599 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java b/service/src/main/java/cn/qihangerp/module/service/TaoOrderService.java similarity index 95% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoOrderService.java index 438274cc..89eceef4 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java +++ b/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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java b/service/src/main/java/cn/qihangerp/module/service/TaoRefundService.java similarity index 92% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/TaoRefundService.java index b58b9aaf..dfef15f7 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java +++ b/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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java similarity index 92% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java index 9a9451c8..61afca9d 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java similarity index 92% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java index f6719560..12e38bd8 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiGoodsSkuService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/WeiOrderItemService.java similarity index 87% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiOrderItemService.java index dca07563..a3ffa0dd 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; 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/service/src/main/java/cn/qihangerp/module/service/WeiOrderService.java similarity index 94% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiOrderService.java index 15786fec..d45bc5f3 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiOrderService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java b/service/src/main/java/cn/qihangerp/module/service/WeiRefundService.java similarity index 92% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiRefundService.java index 4b7d1d7f..2c578d6b 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiRefundService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiRefundService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java b/service/src/main/java/cn/qihangerp/module/service/WeiWaybillAccountService.java similarity index 89% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java rename to service/src/main/java/cn/qihangerp/module/service/WeiWaybillAccountService.java index 1c7c4b17..9e52ef02 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/WeiWaybillAccountService.java +++ b/service/src/main/java/cn/qihangerp/module/service/WeiWaybillAccountService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.WeiWaybillAccount; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpInventoryOperationServiceImpl.java similarity index 73% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpInventoryOperationServiceImpl.java index 7cd4db56..ca03a8e2 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpInventoryOperationServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpInventoryOperationServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.WmsInventoryOperation; -import cn.qihangerp.module.stock.mapper.WmsInventoryOperationMapper; -import cn.qihangerp.module.stock.service.ErpInventoryOperationService; +import cn.qihangerp.mapper.WmsInventoryOperationMapper; +import cn.qihangerp.module.service.ErpInventoryOperationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInItemServiceImpl.java similarity index 73% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInItemServiceImpl.java index 768e4973..eb356729 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInItemServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.ErpStockInItem; -import cn.qihangerp.module.stock.mapper.ErpStockInItemMapper; -import cn.qihangerp.module.stock.service.ErpStockInItemService; +import cn.qihangerp.mapper.ErpStockInItemMapper; +import cn.qihangerp.module.service.ErpStockInItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInServiceImpl.java similarity index 97% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInServiceImpl.java index 6f30e37d..6ccfd3f3 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockInServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -8,17 +8,17 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventoryBatch; +import cn.qihangerp.module.service.ErpStockInItemService; +import cn.qihangerp.module.service.ErpStockInService; import cn.qihangerp.module.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryService; import cn.qihangerp.model.entity.ErpStockIn; import cn.qihangerp.model.entity.ErpStockInItem; -import cn.qihangerp.module.stock.mapper.ErpStockInMapper; +import cn.qihangerp.mapper.ErpStockInMapper; 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; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemPositionServiceImpl.java similarity index 73% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemPositionServiceImpl.java index 10d0c20a..11cc84d1 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemPositionServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemPositionServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.ErpStockOutItemPosition; -import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; -import cn.qihangerp.module.stock.service.ErpStockOutItemPositionService; +import cn.qihangerp.mapper.ErpStockOutItemPositionMapper; +import cn.qihangerp.module.service.ErpStockOutItemPositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemServiceImpl.java similarity index 82% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemServiceImpl.java index e68ad83c..3a00ab13 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutItemServiceImpl.java @@ -1,9 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.mapper.ErpStockOutItemMapper; import cn.qihangerp.model.entity.ErpStockOutItem; - -import cn.qihangerp.module.stock.service.ErpStockOutItemService; +import cn.qihangerp.module.service.ErpStockOutItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutServiceImpl.java similarity index 97% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutServiceImpl.java index 4a473f0f..850e29ca 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpStockOutServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -8,17 +8,17 @@ import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpStockOutMapper; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventoryBatch; +import cn.qihangerp.module.service.ErpStockOutItemService; +import cn.qihangerp.module.service.ErpStockOutService; import cn.qihangerp.module.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryService; import cn.qihangerp.model.entity.ErpStockOut; import cn.qihangerp.model.entity.ErpStockOutItem; import cn.qihangerp.model.entity.ErpStockOutItemPosition; -import cn.qihangerp.module.stock.mapper.ErpStockOutItemPositionMapper; +import cn.qihangerp.mapper.ErpStockOutItemPositionMapper; 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; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehousePositionServiceImpl.java similarity index 73% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehousePositionServiceImpl.java index 88f52372..9353a794 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehousePositionServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehousePositionServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.ErpWarehousePosition; -import cn.qihangerp.module.stock.mapper.ErpWarehousePositionMapper; -import cn.qihangerp.module.stock.service.ErpWarehousePositionService; +import cn.qihangerp.mapper.ErpWarehousePositionMapper; +import cn.qihangerp.module.service.ErpWarehousePositionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehouseServiceImpl.java similarity index 72% rename from serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehouseServiceImpl.java index 6990959c..37f56376 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpWarehouseServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/ErpWarehouseServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.stock.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.ErpWarehouse; -import cn.qihangerp.module.stock.mapper.ErpWarehouseMapper; -import cn.qihangerp.module.stock.service.ErpWarehouseService; +import cn.qihangerp.mapper.ErpWarehouseMapper; +import cn.qihangerp.module.service.ErpWarehouseService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java index c088a812..8c9e1e5e 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java @@ -2,12 +2,11 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.mapper.*; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.mapper.OGoodsInventoryMapper; -import cn.qihangerp.mapper.OGoodsMapper; -import cn.qihangerp.mapper.OGoodsSkuMapper; +import cn.qihangerp.module.service.JdGoodsService; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -19,12 +18,7 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.model.entity.JdGoods; import cn.qihangerp.model.entity.JdGoodsSku; - import cn.qihangerp.model.bo.JdGoodsBo; -import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; - -import cn.qihangerp.module.open.jd.service.JdGoodsService; -import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -41,7 +35,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @Service public class JdGoodsServiceImpl extends ServiceImpl - implements JdGoodsService{ + implements JdGoodsService { private final JdGoodsMapper mapper; private final JdGoodsSkuMapper skuMapper; private final OGoodsSkuMapper goodsSkuMapper; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java index c76c8d25..d13bbe53 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java @@ -1,13 +1,15 @@ package cn.qihangerp.module.service.impl; import cn.qihangerp.common.ResultVo; +import cn.qihangerp.mapper.JdGoodsMapper; +import cn.qihangerp.mapper.JdGoodsSkuMapper; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; +import cn.qihangerp.module.service.JdGoodsSkuService; import cn.qihangerp.module.service.OGoodsService; import cn.qihangerp.module.service.OGoodsSkuService; 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; @@ -15,8 +17,6 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; 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; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -32,7 +32,7 @@ import java.util.List; @AllArgsConstructor @Service public class JdGoodsSkuServiceImpl extends ServiceImpl - implements JdGoodsSkuService{ + implements JdGoodsSkuService { private final JdGoodsSkuMapper mapper; private final JdGoodsMapper jdGoodsMapper; private final OGoodsSkuService oGoodsSkuService; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java index 39a742f6..4ff304f4 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java @@ -1,9 +1,9 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.mapper.JdOrderCouponMapper; import cn.qihangerp.model.entity.JdOrderCoupon; +import cn.qihangerp.module.service.JdOrderCouponService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.open.jd.service.JdOrderCouponService; -import cn.qihangerp.module.open.jd.mapper.JdOrderCouponMapper; import org.springframework.stereotype.Service; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class JdOrderCouponServiceImpl extends ServiceImpl - implements JdOrderCouponService{ + implements JdOrderCouponService { } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java index 494e7389..f5264f7c 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java @@ -1,9 +1,9 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.mapper.JdOrderItemMapper; +import cn.qihangerp.module.service.JdOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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; /** @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; */ @Service public class JdOrderItemServiceImpl extends ServiceImpl - implements JdOrderItemService{ + implements JdOrderItemService { } diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java index 210aa149..c3ad3c54 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java @@ -1,8 +1,12 @@ package cn.qihangerp.module.service.impl; +import cn.qihangerp.mapper.JdGoodsSkuMapper; +import cn.qihangerp.mapper.JdOrderCouponMapper; +import cn.qihangerp.mapper.JdOrderItemMapper; +import cn.qihangerp.mapper.JdOrderMapper; import cn.qihangerp.model.entity.JdOrder; import cn.qihangerp.model.entity.JdOrderCoupon; -import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; +import cn.qihangerp.module.service.JdOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -12,11 +16,6 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; 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; -import cn.qihangerp.module.open.jd.mapper.JdOrderMapper; - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,7 +35,7 @@ import java.util.regex.Pattern; @AllArgsConstructor @Service public class JdOrderServiceImpl extends ServiceImpl - implements JdOrderService{ + implements JdOrderService { private final JdOrderMapper mapper; private final JdOrderItemMapper itemMapper; private final JdOrderCouponMapper couponMapper; diff --git a/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java index 07667487..d7ca1390 100644 --- a/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java @@ -4,14 +4,14 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.mapper.JdGoodsSkuMapper; +import cn.qihangerp.mapper.JdOrderItemMapper; +import cn.qihangerp.mapper.JdOrderMapper; +import cn.qihangerp.mapper.JdRefundMapper; 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; -import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; -import cn.qihangerp.module.open.jd.service.JdRefundService; +import cn.qihangerp.module.service.JdRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java similarity index 98% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java index 05609736..c86bb23b 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; @@ -15,9 +15,9 @@ import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.model.bo.PddGoodsBo; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; -import cn.qihangerp.module.open.pdd.service.PddGoodsService; +import cn.qihangerp.mapper.PddGoodsMapper; +import cn.qihangerp.mapper.PddGoodsSkuMapper; +import cn.qihangerp.module.service.PddGoodsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java similarity index 93% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java index d2722561..c97425f9 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddGoodsSkuServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -10,9 +10,9 @@ import cn.qihangerp.module.service.OGoodsService; import cn.qihangerp.module.service.OGoodsSkuService; import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoodsSku; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; -import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService; +import cn.qihangerp.mapper.PddGoodsMapper; +import cn.qihangerp.mapper.PddGoodsSkuMapper; +import cn.qihangerp.module.service.PddGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderItemServiceImpl.java similarity index 72% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/PddOrderItemServiceImpl.java index c7566e21..092440e1 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderItemServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.open.pdd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.PddOrderItem; -import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper; -import cn.qihangerp.module.open.pdd.service.PddOrderItemService; +import cn.qihangerp.mapper.PddOrderItemMapper; +import cn.qihangerp.module.service.PddOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java similarity index 98% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java index 37137fee..1de69631 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddOrderServiceImpl.java @@ -1,5 +1,4 @@ -package cn.qihangerp.module.open.pdd.service.impl; - +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -15,10 +14,10 @@ import cn.qihangerp.model.entity.PddOrder; import cn.qihangerp.model.entity.PddOrderItem; import cn.qihangerp.model.bo.PddOrderBo; import cn.qihangerp.model.bo.PddOrderConfirmBo; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; -import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper; -import cn.qihangerp.module.open.pdd.mapper.PddOrderMapper; -import cn.qihangerp.module.open.pdd.service.PddOrderService; +import cn.qihangerp.mapper.PddGoodsSkuMapper; +import cn.qihangerp.mapper.PddOrderItemMapper; +import cn.qihangerp.mapper.PddOrderMapper; +import cn.qihangerp.module.service.PddOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/PddRefundServiceImpl.java similarity index 94% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/PddRefundServiceImpl.java index 143db9af..bb7c5357 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/PddRefundServiceImpl.java @@ -1,5 +1,4 @@ -package cn.qihangerp.module.open.pdd.service.impl; - +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -8,9 +7,9 @@ import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.model.entity.PddRefund; import cn.qihangerp.model.bo.PddRefundBo; -import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; -import cn.qihangerp.module.open.pdd.mapper.PddRefundMapper; -import cn.qihangerp.module.open.pdd.service.PddRefundService; +import cn.qihangerp.mapper.PddGoodsSkuMapper; +import cn.qihangerp.mapper.PddRefundMapper; +import cn.qihangerp.module.service.PddRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java similarity index 98% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java index 5672de71..0263b128 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; @@ -15,9 +15,9 @@ import cn.qihangerp.mapper.OGoodsSkuMapper; 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; +import cn.qihangerp.mapper.TaoGoodsMapper; +import cn.qihangerp.mapper.TaoGoodsSkuMapper; +import cn.qihangerp.module.service.TaoGoodsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java similarity index 92% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java index 7ebda5ab..b767abfb 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoGoodsSkuServiceImpl.java @@ -1,17 +1,17 @@ -package cn.qihangerp.module.open.tao.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.OGoodsSku; -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.mapper.TaoGoodsMapper; -import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; -import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; +import cn.qihangerp.mapper.TaoGoodsMapper; +import cn.qihangerp.mapper.TaoGoodsSkuMapper; +import cn.qihangerp.module.service.OGoodsSkuService; +import cn.qihangerp.module.service.TaoGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderItemServiceImpl.java similarity index 72% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderItemServiceImpl.java index 25909963..6d0c759a 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderItemServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.open.tao.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.TaoOrderItem; -import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper; -import cn.qihangerp.module.open.tao.service.TaoOrderItemService; +import cn.qihangerp.mapper.TaoOrderItemMapper; +import cn.qihangerp.module.service.TaoOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderPromotionServiceImpl.java similarity index 72% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderPromotionServiceImpl.java index 5ded19cc..aff0b06a 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderPromotionServiceImpl.java @@ -1,8 +1,8 @@ -package cn.qihangerp.module.open.tao.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.TaoOrderPromotion; -import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper; -import cn.qihangerp.module.open.tao.service.TaoOrderPromotionService; +import cn.qihangerp.mapper.TaoOrderPromotionMapper; +import cn.qihangerp.module.service.TaoOrderPromotionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderServiceImpl.java similarity index 98% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderServiceImpl.java index 0b820cc0..abca254c 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoOrderServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.tao.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; @@ -16,11 +16,11 @@ 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; -import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; -import cn.qihangerp.module.open.tao.service.TaoOrderService; +import cn.qihangerp.mapper.TaoOrderItemMapper; +import cn.qihangerp.mapper.TaoOrderMapper; +import cn.qihangerp.mapper.TaoOrderPromotionMapper; +import cn.qihangerp.module.service.TaoGoodsSkuService; +import cn.qihangerp.module.service.TaoOrderService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,7 +30,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; - import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Date; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/TaoRefundServiceImpl.java similarity index 94% rename from serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/TaoRefundServiceImpl.java index 222f8a0b..c7f77c13 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/TaoRefundServiceImpl.java @@ -1,5 +1,4 @@ -package cn.qihangerp.module.open.tao.service.impl; - +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -7,9 +6,9 @@ import cn.qihangerp.common.ResultVoEnum; 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; +import cn.qihangerp.mapper.TaoGoodsSkuMapper; +import cn.qihangerp.mapper.TaoRefundMapper; +import cn.qihangerp.module.service.TaoRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java index 5eda35fc..91fc6ded 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -13,9 +13,9 @@ import cn.qihangerp.mapper.OGoodsMapper; import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.model.entity.WeiGoods; import cn.qihangerp.model.entity.WeiGoodsSku; -import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper; -import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; -import cn.qihangerp.module.open.wei.service.WeiGoodsService; +import cn.qihangerp.mapper.WeiGoodsMapper; +import cn.qihangerp.mapper.WeiGoodsSkuMapper; +import cn.qihangerp.module.service.WeiGoodsService; import com.alibaba.fastjson2.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java similarity index 92% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java index 46f502a5..9092829c 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiGoodsSkuServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -6,13 +6,13 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; -import cn.qihangerp.module.service.OGoodsService; -import cn.qihangerp.module.service.OGoodsSkuService; 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; +import cn.qihangerp.mapper.WeiGoodsMapper; +import cn.qihangerp.mapper.WeiGoodsSkuMapper; +import cn.qihangerp.module.service.OGoodsService; +import cn.qihangerp.module.service.OGoodsSkuService; +import cn.qihangerp.module.service.WeiGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderItemServiceImpl.java similarity index 71% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderItemServiceImpl.java index 3c69206f..3ffa6115 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderItemServiceImpl.java @@ -1,9 +1,9 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; -import cn.qihangerp.module.open.wei.service.WeiOrderItemService; +import cn.qihangerp.module.service.WeiOrderItemService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.WeiOrderItem; -import cn.qihangerp.module.open.wei.mapper.WeiOrderItemMapper; +import cn.qihangerp.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/service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderServiceImpl.java similarity index 98% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderServiceImpl.java index 30a3c938..8d02943f 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiOrderServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; @@ -13,10 +13,10 @@ 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; -import cn.qihangerp.module.open.wei.service.WeiOrderService; +import cn.qihangerp.mapper.WeiGoodsSkuMapper; +import cn.qihangerp.mapper.WeiOrderItemMapper; +import cn.qihangerp.mapper.WeiOrderMapper; +import cn.qihangerp.module.service.WeiOrderService; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiRefundServiceImpl.java similarity index 92% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiRefundServiceImpl.java index 85239d2e..83c8ceed 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiRefundServiceImpl.java @@ -1,15 +1,14 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; -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; -import cn.qihangerp.module.open.wei.service.WeiRefundService; +import cn.qihangerp.mapper.WeiGoodsSkuMapper; +import cn.qihangerp.mapper.WeiOrderItemMapper; +import cn.qihangerp.mapper.WeiRefundMapper; +import cn.qihangerp.module.service.WeiRefundService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/WeiWaybillAccountServiceImpl.java similarity index 73% rename from serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/WeiWaybillAccountServiceImpl.java index 5a4f4e85..4d4df0f0 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiWaybillAccountServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/WeiWaybillAccountServiceImpl.java @@ -1,9 +1,9 @@ -package cn.qihangerp.module.open.wei.service.impl; +package cn.qihangerp.module.service.impl; +import cn.qihangerp.module.service.WeiWaybillAccountService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.WeiWaybillAccount; -import cn.qihangerp.module.open.wei.service.WeiWaybillAccountService; -import cn.qihangerp.module.open.wei.mapper.WeiWaybillAccountMapper; +import cn.qihangerp.mapper.WeiWaybillAccountMapper; import org.springframework.stereotype.Service; /** diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index dd75df82..a1156649 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -19,12 +19,12 @@ - wei - stock + + - tao - pdd + +