diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 515fd8cc..23e016d1 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -109,6 +109,17 @@ dou-api 1.0.6 + + cn.qihangerp.services + tao-api + 1.0.6 + + + + + + + cn.qihangerp.module diff --git a/microservices/pom.xml b/microservices/pom.xml index 13401ad0..c8fa7d43 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -20,6 +20,7 @@ order-api jd-api dou-api + tao-api diff --git a/microservices/tao-api/libs/open-sdk-1.4.20.jar b/microservices/tao-api/libs/open-sdk-1.4.20.jar new file mode 100644 index 00000000..83a202a4 Binary files /dev/null and b/microservices/tao-api/libs/open-sdk-1.4.20.jar differ diff --git a/microservices/tao-api/pom.xml b/microservices/tao-api/pom.xml new file mode 100644 index 00000000..5636cd7c --- /dev/null +++ b/microservices/tao-api/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + cn.qihangerp.services + microservices + 1.0.6 + + + tao-api + jar + + tao-api + http://maven.apache.org + + + UTF-8 + + + + + cn.qihangerp.open + open-sdk + 1.0.2 + system + ${project.basedir}/libs/open-sdk-1.4.20.jar + + + cn.qihangerp.module + tao + 1.0 + + + cn.qihangerp.module + shop + 1.0 + + + diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/OrderAssembleHelper.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java similarity index 99% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/OrderAssembleHelper.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java index 7d1f7b86..5dc30b2f 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/OrderAssembleHelper.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/OrderAssembleHelper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao; +package cn.qihangerp.api.tao; import cn.qihangerp.module.open.tao.domain.TaoOrder; diff --git a/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java new file mode 100644 index 00000000..cda4b9c9 --- /dev/null +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiAutoConfiguration.java @@ -0,0 +1,18 @@ +package cn.qihangerp.api.tao; + +//import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; + + +//@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class ,MybatisAutoConfiguration.class}) +//@ComponentScan +//@Configuration +//@EnableAutoConfiguration +@Configuration +//@EnableAutoConfiguration(exclude = MybatisAutoConfiguration.class) +@ComponentScan(basePackages = "cn.qihangerp.api.tao", + excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = TaoApiAutoConfiguration.class)) +public class TaoApiAutoConfiguration { +} diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java similarity index 99% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java index 6f7779ff..5cfb8ed1 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/TaoApiCommon.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoApiCommon.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao; +package cn.qihangerp.api.tao; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/TaoRequest.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/TaoRequest.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java index b3015753..ceb1fa40 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/TaoRequest.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/TaoRequest.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao; +package cn.qihangerp.api.tao; public class TaoRequest { private Long shopId;//店铺Id diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java index bec91e6b..79b762fb 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsApiController.java @@ -1,6 +1,8 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; +import cn.qihangerp.api.tao.TaoApiCommon; +import cn.qihangerp.api.tao.TaoRequest; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.api.ShopApiParams; @@ -13,12 +15,13 @@ import cn.qihangerp.domain.OShopPullLogs; import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.service.TaoGoodsService; + import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.tao.TaoApiCommon; + import cn.qihangerp.open.tao.TaoGoodsApiHelper; -import cn.qihangerp.open.tao.TaoRequest; + import cn.qihangerp.open.tao.response.TaoGoodsResponse; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java index 3194f8a6..d4fdab84 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoGoodsController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoGoodsController.java @@ -1,12 +1,10 @@ -package cn.qihangerp.open.tao.controller; - +package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; - import cn.qihangerp.domain.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsSkuService; @@ -16,7 +14,6 @@ import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; import cn.qihangerp.module.open.tao.service.TaoGoodsService; import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; - import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java index 39cd0f56..6fe044c3 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOAuthController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOAuthController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.utils.StringUtils; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java index 6f775d40..fbb51462 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderApiController.java @@ -1,6 +1,9 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; +import cn.qihangerp.api.tao.OrderAssembleHelper; +import cn.qihangerp.api.tao.TaoApiCommon; +import cn.qihangerp.api.tao.TaoRequest; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -15,10 +18,9 @@ import cn.qihangerp.module.open.tao.service.TaoOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.tao.OrderAssembleHelper; -import cn.qihangerp.open.tao.TaoApiCommon; + import cn.qihangerp.open.tao.TaoOrderApiHelper; -import cn.qihangerp.open.tao.TaoRequest; + import cn.qihangerp.open.tao.response.TaoOrderDetailResponse; import cn.qihangerp.open.tao.response.TaoOrderListResponse; import lombok.AllArgsConstructor; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java index ba06771f..d51177e3 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoOrderController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoOrderController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java index 3feef50e..e8c3e571 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundApiController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundApiController.java @@ -1,6 +1,8 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; +import cn.qihangerp.api.tao.TaoApiCommon; +import cn.qihangerp.api.tao.TaoRequest; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -15,9 +17,9 @@ import cn.qihangerp.module.open.tao.service.TaoRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.tao.TaoApiCommon; + import cn.qihangerp.open.tao.TaoRefundApiHelper; -import cn.qihangerp.open.tao.TaoRequest; + import cn.qihangerp.open.tao.response.TaoRefundResponse; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java index 84ece2f1..9cde74b4 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoRefundController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoRefundController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoShipController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java similarity index 93% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoShipController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java index ec1b465e..c982b239 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/TaoShipController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/TaoShipController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller; +package cn.qihangerp.api.tao.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoOrderFeignController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java similarity index 94% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoOrderFeignController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java index 5a2c030d..5962d874 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoOrderFeignController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoOrderFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller.feign; +package cn.qihangerp.api.tao.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.tao.domain.TaoOrder; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoRefundFeignController.java b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java similarity index 95% rename from api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoRefundFeignController.java rename to microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java index f799b0a0..4bbb1eea 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/tao/controller/feign/TaoRefundFeignController.java +++ b/microservices/tao-api/src/main/java/cn/qihangerp/api/tao/controller/feign/TaoRefundFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.tao.controller.feign; +package cn.qihangerp.api.tao.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.tao.domain.TaoRefund; diff --git a/microservices/tao-api/src/main/resources/META-INF/spring.factories b/microservices/tao-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..818dc946 --- /dev/null +++ b/microservices/tao-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration \ No newline at end of file diff --git a/microservices/tao-api/src/main/resources/application.yml b/microservices/tao-api/src/main/resources/application.yml new file mode 100644 index 00000000..35bc8f62 --- /dev/null +++ b/microservices/tao-api/src/main/resources/application.yml @@ -0,0 +1,4 @@ +qihangerp: + name: 启航电商ERP + goods: + version: 2.4.21 \ No newline at end of file diff --git a/microservices/tao-api/src/main/resources/banner.txt b/microservices/tao-api/src/main/resources/banner.txt new file mode 100644 index 00000000..b2d3f138 --- /dev/null +++ b/microservices/tao-api/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Application Version: 2.4.21 +Spring Boot Version: ${spring-boot.version} + _______ _________ _______ _ _______ _______ _______ _______ +( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) +| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| +| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| +| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) +| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( +| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) +(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/module/pom.xml b/module/pom.xml index 83adc7c8..ba0e51ee 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -23,6 +23,7 @@ stock jd dou + tao diff --git a/module/tao/pom.xml b/module/tao/pom.xml new file mode 100644 index 00000000..5e223d46 --- /dev/null +++ b/module/tao/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + cn.qihangerp.module + module + 1.0 + + + tao + jar + + tao + http://maven.apache.org + + + UTF-8 + + + + + cn.qihangerp.core + common + 1.0 + compile + + + cn.qihangerp.module + goods + 1.0 + + + com.baomidou + mybatis-plus-spring-boot3-starter + 3.5.5 + compile + + + diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoods.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoGoodsSku.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrder.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderItem.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java index 0b878708..141f8b40 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoOrderPromotion.java @@ -1,10 +1,10 @@ package cn.qihangerp.module.open.tao.domain; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; + /** * 订单优惠信息 * @TableName tao_order_promotion diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/TaoRefund.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoGoodsBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderPushBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoOrderShipBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoRefundBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/bo/TaoTokenSaveBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/domain/vo/TaoGoodsSkuListVo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java index 1217eff4..8223b625 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoGoodsSkuMapper.java @@ -2,11 +2,9 @@ package cn.qihangerp.module.open.tao.mapper; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - import org.apache.ibatis.annotations.Param; /** diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoOrderPromotionMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/mapper/TaoRefundMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java index a2ee6e46..48dd1103 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsService.java @@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java index afccb467..1bfa58c1 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoGoodsSkuService.java @@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderPromotionService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java index 9ea93795..9d8feef5 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoOrderService.java @@ -3,9 +3,8 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; - -import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; import cn.qihangerp.module.open.tao.domain.TaoOrder; +import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java index 633e61d1..bab8e832 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/TaoRefundService.java @@ -2,7 +2,6 @@ package cn.qihangerp.module.open.tao.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - import cn.qihangerp.module.open.tao.domain.TaoRefund; import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java index a0177c4c..d3139fb7 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java @@ -1,23 +1,21 @@ package cn.qihangerp.module.open.tao.service.impl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVoEnum; +import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; +import cn.qihangerp.module.open.tao.domain.TaoGoods; +import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsService; -import cn.qihangerp.module.open.tao.domain.TaoGoods; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; - - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java index 38135798..d352df96 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java @@ -1,15 +1,14 @@ package cn.qihangerp.module.open.tao.service.impl; +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.domain.vo.TaoGoodsSkuListVo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsSkuService; -import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java index a9294639..7d9b7610 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderItemServiceImpl.java @@ -1,10 +1,9 @@ package cn.qihangerp.module.open.tao.service.impl; +import cn.qihangerp.module.open.tao.domain.TaoOrderItem; import cn.qihangerp.module.open.tao.mapper.TaoOrderItemMapper; import cn.qihangerp.module.open.tao.service.TaoOrderItemService; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import org.springframework.stereotype.Service; /** diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java index a9b30319..cdcc77bb 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderPromotionServiceImpl.java @@ -1,10 +1,9 @@ package cn.qihangerp.module.open.tao.service.impl; +import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; import cn.qihangerp.module.open.tao.mapper.TaoOrderPromotionMapper; import cn.qihangerp.module.open.tao.service.TaoOrderPromotionService; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import org.springframework.stereotype.Service; /** diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java similarity index 96% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java index 8d2e43b7..7b212fc7 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoOrderServiceImpl.java @@ -1,24 +1,23 @@ package cn.qihangerp.module.open.tao.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.module.open.tao.domain.TaoGoodsSku; +import cn.qihangerp.module.open.tao.domain.TaoOrder; +import cn.qihangerp.module.open.tao.domain.TaoOrderItem; +import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; import cn.qihangerp.module.open.tao.domain.bo.TaoOrderBo; import cn.qihangerp.module.open.tao.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.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.TaoOrder; -import cn.qihangerp.module.open.tao.domain.TaoOrderItem; -import cn.qihangerp.module.open.tao.domain.TaoOrderPromotion; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.common.PageQuery; -import cn.qihangerp.common.PageResult; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.common.ResultVo; - import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.stereotype.Service; @@ -50,14 +49,14 @@ public class TaoOrderServiceImpl extends ServiceImpl private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); @Override public PageResult queryPageList(TaoOrderBo bo, PageQuery pageQuery) { - if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){ + if(StringUtils.hasText(bo.getStartTime())){ Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime()); boolean b = matcher.find(); if(b){ bo.setStartTime(bo.getStartTime()+" 00:00:00"); } } - if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){ + if(StringUtils.hasText(bo.getEndTime())){ Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime()); boolean b = matcher.find(); if(b){ @@ -69,8 +68,8 @@ public class TaoOrderServiceImpl extends ServiceImpl .eq(bo.getShopId()!=null,TaoOrder::getShopId,bo.getShopId()) .eq(StringUtils.hasText(bo.getTid()),TaoOrder::getTid,bo.getTid()) .eq(StringUtils.hasText(bo.getStatus()),TaoOrder::getStatus,bo.getStatus()) - .ge(org.springframework.util.StringUtils.hasText(bo.getStartTime()),TaoOrder::getCreated,bo.getStartTime()+" 00:00:00") - .le(org.springframework.util.StringUtils.hasText(bo.getEndTime()),TaoOrder::getCreated,bo.getEndTime()+" 23:59:59") + .ge(StringUtils.hasText(bo.getStartTime()),TaoOrder::getCreated,bo.getStartTime()+" 00:00:00") + .le(StringUtils.hasText(bo.getEndTime()),TaoOrder::getCreated,bo.getEndTime()+" 23:59:59") ; pageQuery.setOrderByColumn("created"); pageQuery.setIsAsc("desc"); diff --git a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java rename to module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java index abe183d3..f2723c33 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java +++ b/module/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoRefundServiceImpl.java @@ -1,19 +1,18 @@ package cn.qihangerp.module.open.tao.service.impl; -import cn.qihangerp.module.open.tao.domain.TaoRefund; -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.module.open.tao.domain.TaoGoodsSku; -import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVoEnum; - +import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; +import cn.qihangerp.module.open.tao.domain.TaoRefund; +import cn.qihangerp.module.open.tao.domain.bo.TaoRefundBo; +import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; +import cn.qihangerp.module.open.tao.mapper.TaoRefundMapper; +import cn.qihangerp.module.open.tao.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; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/module/open/src/main/resources/mapper/tao/TaoGoodsMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoGoodsMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoGoodsMapper.xml diff --git a/module/open/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoGoodsSkuMapper.xml diff --git a/module/open/src/main/resources/mapper/tao/TaoOrderItemMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoOrderItemMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoOrderItemMapper.xml diff --git a/module/open/src/main/resources/mapper/tao/TaoOrderMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoOrderMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoOrderMapper.xml diff --git a/module/open/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoOrderPromotionMapper.xml diff --git a/module/open/src/main/resources/mapper/tao/TaoRefundMapper.xml b/module/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/tao/TaoRefundMapper.xml rename to module/tao/src/main/resources/mapper/tao/TaoRefundMapper.xml diff --git a/pom.xml b/pom.xml index 3d32bd4e..05d08ca1 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,8 @@ api core module - microservices + microservices +