diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 50591a6c..7b866e7d 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -122,11 +122,11 @@ jackson-mapper-asl 1.9.13 - - cn.qihangerp.service - jd - 2.0.0 - + + + + + diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdGoodsMapper.java similarity index 88% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdGoodsMapper.java index 7df01c67..195fd53d 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdGoodsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdGoodsSkuMapper.java similarity index 95% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdGoodsSkuMapper.java index 041b5f19..ccc5f96b 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdGoodsSkuMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdGoodsSku; import cn.qihangerp.model.vo.JdGoodsSkuListVo; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderCouponMapper.java similarity index 89% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdOrderCouponMapper.java index 00164c0c..d9741191 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderCouponMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdOrderCoupon; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderItemMapper.java similarity index 89% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdOrderItemMapper.java index 9c41f2b3..702b6faa 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderItemMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderMapper.java similarity index 88% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdOrderMapper.java index c680ab3f..7b217d7b 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdOrderMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdOrder; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/JdRefundMapper.java similarity index 89% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/JdRefundMapper.java index d575455a..720ffdd8 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/JdRefundMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.JdRefund; diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml b/mapper/src/main/resources/mapper/JdGoodsMapper.xml similarity index 98% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml rename to mapper/src/main/resources/mapper/JdGoodsMapper.xml index 1ff5b406..57848f20 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/JdGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/JdGoodsSkuMapper.xml similarity index 97% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/JdGoodsSkuMapper.xml index a3ed39fa..7949e577 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/JdGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml b/mapper/src/main/resources/mapper/JdOrderCouponMapper.xml similarity index 90% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml rename to mapper/src/main/resources/mapper/JdOrderCouponMapper.xml index 03a3ed29..af57bb69 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml +++ b/mapper/src/main/resources/mapper/JdOrderCouponMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml b/mapper/src/main/resources/mapper/JdOrderItemMapper.xml similarity index 95% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml rename to mapper/src/main/resources/mapper/JdOrderItemMapper.xml index 411a91c4..c3338b5d 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/JdOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml b/mapper/src/main/resources/mapper/JdOrderMapper.xml similarity index 98% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml rename to mapper/src/main/resources/mapper/JdOrderMapper.xml index 36a0d598..f30e0dbd 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderMapper.xml +++ b/mapper/src/main/resources/mapper/JdOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml b/mapper/src/main/resources/mapper/JdRefundMapper.xml similarity index 98% rename from serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml rename to mapper/src/main/resources/mapper/JdRefundMapper.xml index 3feb4b59..cde63a59 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdRefundMapper.xml +++ b/mapper/src/main/resources/mapper/JdRefundMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/JdGoodsService.java similarity index 94% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/JdGoodsService.java index dca1bc2a..9976868a 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdGoodsService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/JdGoodsSkuService.java similarity index 93% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/JdGoodsSkuService.java index abae9fee..cd4a3c50 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdGoodsSkuService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java b/service/src/main/java/cn/qihangerp/module/service/JdOrderCouponService.java similarity index 87% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java rename to service/src/main/java/cn/qihangerp/module/service/JdOrderCouponService.java index d8a6500b..73b1f05d 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdOrderCouponService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.JdOrderCoupon; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/JdOrderItemService.java similarity index 88% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/JdOrderItemService.java index 2d222b3c..55872255 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.JdOrderItem; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java b/service/src/main/java/cn/qihangerp/module/service/JdOrderService.java similarity index 93% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/JdOrderService.java index c4547e81..6d8d22bb 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdOrderService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java b/service/src/main/java/cn/qihangerp/module/service/JdRefundService.java similarity index 93% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/JdRefundService.java index eff1a67a..dc91b8d0 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java +++ b/service/src/main/java/cn/qihangerp/module/service/JdRefundService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service; +package cn.qihangerp.module.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java similarity index 99% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java index f9747db1..c088a812 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.ResultVoEnum; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java similarity index 98% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java index 512a34d9..c76c8d25 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdGoodsSkuServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java similarity index 91% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java index bf605107..39a742f6 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderCouponServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.model.entity.JdOrderCoupon; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java similarity index 92% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java index ebfd0cba..494e7389 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderItemServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.model.entity.JdOrderItem; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java similarity index 99% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java index cbed413b..210aa149 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdOrderServiceImpl.java @@ -1,6 +1,5 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; -import cn.qihangerp.model.entity.JdGoodsSku; import cn.qihangerp.model.entity.JdOrder; import cn.qihangerp.model.entity.JdOrderCoupon; import cn.qihangerp.module.open.jd.mapper.JdGoodsSkuMapper; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java similarity index 99% rename from serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java index ed847d1a..07667487 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/JdRefundServiceImpl.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.jd.service.impl; +package cn.qihangerp.module.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; diff --git a/serviceImpl/pdd/pom.xml b/serviceImpl/pdd/pom.xml index 3028e4b1..611b6729 100644 --- a/serviceImpl/pdd/pom.xml +++ b/serviceImpl/pdd/pom.xml @@ -29,11 +29,11 @@ mapper 2.0.0 - - cn.qihangerp.service - goods - 2.0.0 - + + + + + com.baomidou mybatis-plus-spring-boot3-starter diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index b77458a0..dd75df82 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -21,7 +21,7 @@ wei stock - jd + tao pdd diff --git a/serviceImpl/stock/pom.xml b/serviceImpl/stock/pom.xml index deaf8086..1f93c176 100644 --- a/serviceImpl/stock/pom.xml +++ b/serviceImpl/stock/pom.xml @@ -24,12 +24,12 @@ 1.0 compile - - cn.qihangerp.service - goods - 2.0.0 - compile - + + + + + + cn.qihangerp.mapper mapper diff --git a/serviceImpl/tao/pom.xml b/serviceImpl/tao/pom.xml index 5da5f4ff..93b0386d 100644 --- a/serviceImpl/tao/pom.xml +++ b/serviceImpl/tao/pom.xml @@ -29,11 +29,11 @@ mapper 2.0.0 - - cn.qihangerp.service - goods - 2.0.0 - + + + + + com.baomidou mybatis-plus-spring-boot3-starter diff --git a/serviceImpl/wei/pom.xml b/serviceImpl/wei/pom.xml index 21bcf5ee..b9105560 100644 --- a/serviceImpl/wei/pom.xml +++ b/serviceImpl/wei/pom.xml @@ -29,11 +29,11 @@ mapper 2.0.0 - - cn.qihangerp.service - goods - 2.0.0 - + + + + + com.baomidou mybatis-plus-spring-boot3-starter