diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 2bd3e52f..515fd8cc 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -97,6 +97,19 @@ 1.18.30 provided + + + + cn.qihangerp.services + jd-api + 1.0.6 + + + cn.qihangerp.services + dou-api + 1.0.6 + + cn.qihangerp.module open diff --git a/microservices/dou-api/libs/open-sdk-1.4.20.jar b/microservices/dou-api/libs/open-sdk-1.4.20.jar new file mode 100644 index 00000000..83a202a4 Binary files /dev/null and b/microservices/dou-api/libs/open-sdk-1.4.20.jar differ diff --git a/microservices/dou-api/pom.xml b/microservices/dou-api/pom.xml new file mode 100644 index 00000000..5e51bd60 --- /dev/null +++ b/microservices/dou-api/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + cn.qihangerp.services + microservices + 1.0.6 + + + dou-api + jar + + dou-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 + dou + 1.0 + + + diff --git a/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java new file mode 100644 index 00000000..bc87d179 --- /dev/null +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiAutoConfiguration.java @@ -0,0 +1,18 @@ +package cn.qihangerp.api.dou; + +//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.dou", + excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = DouApiAutoConfiguration.class)) +public class DouApiAutoConfiguration { +} diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/DouApiCommon.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java similarity index 99% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/DouApiCommon.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java index beaa7c7a..c5f00043 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/DouApiCommon.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/DouApiCommon.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.dou; +package cn.qihangerp.api.dou; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.api.ShopApiParams; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java index ec2189dc..c04cc9ad 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsApiController.java @@ -1,24 +1,23 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.controller; +import cn.qihangerp.api.dou.DouApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.domain.OShopPullLasttime; import cn.qihangerp.domain.OShopPullLogs; - import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.dou.DouApiCommon; import cn.qihangerp.open.dou.DouGoodsApiHelper; import cn.qihangerp.open.dou.model.GoodsListResultVo; +import cn.qihangerp.sdk.dou.PullRequest; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java index 8100e117..e9184530 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouGoodsController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouGoodsController.java @@ -1,11 +1,10 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.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; @@ -15,7 +14,6 @@ import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo; import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; - 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/dou/controller/DouOrderApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java similarity index 99% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java index f2b2ef06..22067707 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderApiController.java @@ -1,6 +1,7 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.controller; +import cn.qihangerp.api.dou.DouApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -15,13 +16,12 @@ import cn.qihangerp.module.open.dou.domain.DouOrderItem; import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.dou.DouApiCommon; import cn.qihangerp.open.dou.DouOrderApiHelper; import cn.qihangerp.open.dou.DouTokenApiHelper; import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.order.Order; +import cn.qihangerp.sdk.dou.PullRequest; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java index 56808a9c..ade5d429 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouOrderContoller.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouOrderContoller.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java index e80bd742..164a16fe 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundApiController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundApiController.java @@ -1,6 +1,7 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.controller; +import cn.qihangerp.api.dou.DouApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -14,13 +15,14 @@ import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; + import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.dou.DouApiCommon; + import cn.qihangerp.open.dou.DouRefundApiHelper; import cn.qihangerp.open.dou.DouTokenApiHelper; import cn.qihangerp.open.dou.model.Token; import cn.qihangerp.open.dou.model.after.AfterSale; +import cn.qihangerp.sdk.dou.PullRequest; import com.alibaba.fastjson2.JSONObject; import lombok.AllArgsConstructor; import org.slf4j.Logger; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java index 3cbb7344..2fb15c96 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/DouRefundController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/DouRefundController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.dou.controller; +package cn.qihangerp.api.dou.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouOrderFeignController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java similarity index 94% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouOrderFeignController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java index 91f1d8fb..a78021b0 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouOrderFeignController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouOrderFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.dou.controller.feign; +package cn.qihangerp.api.dou.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.dou.domain.DouOrder; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouRefundFeignController.java b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java similarity index 94% rename from api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouRefundFeignController.java rename to microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java index c10d6885..44eab512 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/dou/controller/feign/DouRefundFeignController.java +++ b/microservices/dou-api/src/main/java/cn/qihangerp/api/dou/controller/feign/DouRefundFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.dou.controller.feign; +package cn.qihangerp.api.dou.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.dou.domain.DouRefund; diff --git a/microservices/dou-api/src/main/resources/META-INF/spring.factories b/microservices/dou-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..818dc946 --- /dev/null +++ b/microservices/dou-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/dou-api/src/main/resources/application.yml b/microservices/dou-api/src/main/resources/application.yml new file mode 100644 index 00000000..35bc8f62 --- /dev/null +++ b/microservices/dou-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/dou-api/src/main/resources/banner.txt b/microservices/dou-api/src/main/resources/banner.txt new file mode 100644 index 00000000..b2d3f138 --- /dev/null +++ b/microservices/dou-api/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Application Version: 2.4.21 +Spring Boot Version: ${spring-boot.version} + _______ _________ _______ _ _______ _______ _______ _______ +( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) +| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| +| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| +| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) +| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( +| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) +(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/jd-api/libs/open-sdk-1.4.20.jar b/microservices/jd-api/libs/open-sdk-1.4.20.jar new file mode 100644 index 00000000..83a202a4 Binary files /dev/null and b/microservices/jd-api/libs/open-sdk-1.4.20.jar differ diff --git a/microservices/jd-api/pom.xml b/microservices/jd-api/pom.xml new file mode 100644 index 00000000..568bb8df --- /dev/null +++ b/microservices/jd-api/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + cn.qihangerp.services + microservices + 1.0.6 + + + jd-api + jar + + jd-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 + jd + 1.0 + + + diff --git a/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java new file mode 100644 index 00000000..2b9eb13b --- /dev/null +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiAutoConfiguration.java @@ -0,0 +1,18 @@ +package cn.qihangerp.api.jd; + +//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.jd", + excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = JdApiAutoConfiguration.class)) +public class JdApiAutoConfiguration { +} diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java similarity index 99% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java index c6c813a9..a92c7eb8 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/JdApiCommon.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/JdApiCommon.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd; +package cn.qihangerp.api.jd; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java index f3cea573..d0f91a4b 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsApiController.java @@ -1,6 +1,7 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; +import cn.qihangerp.api.jd.JdApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; @@ -10,11 +11,10 @@ import cn.qihangerp.module.open.jd.domain.JdGoodsSku; import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.jd.JdApiCommon; import cn.qihangerp.open.jd.JdGoodsApiHelper; import cn.qihangerp.open.jd.response.JdGoodsSkuListResponse; +import cn.qihangerp.sdk.jd.PullRequest; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java index d2241ecc..2c70c772 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdGoodsController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdGoodsController.java @@ -1,12 +1,10 @@ -package cn.qihangerp.open.jd.controller; - +package cn.qihangerp.api.jd.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.jd.domain.bo.JdGoodsBo; import cn.qihangerp.module.open.jd.domain.vo.JdGoodsSkuListVo; import cn.qihangerp.module.open.jd.service.JdGoodsService; import cn.qihangerp.module.open.jd.service.JdGoodsSkuService; - 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/jd/controller/JdOAuthController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java index 7e75fe51..47ed9035 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOAuthController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOAuthController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.domain.OShopPlatform; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleApiController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java index 1006eca0..07dd5bba 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleApiController.java @@ -1,7 +1,8 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; +import cn.qihangerp.api.jd.JdApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -16,12 +17,13 @@ import cn.qihangerp.module.open.jd.domain.JdRefund; import cn.qihangerp.module.open.jd.service.JdRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; + import cn.qihangerp.open.common.ApiResultVo; import cn.qihangerp.open.jd.JdAfterSaleApiHelper; -import cn.qihangerp.open.jd.JdApiCommon; + import cn.qihangerp.open.jd.model.AfterSale; import cn.qihangerp.open.jd.model.Refund; +import cn.qihangerp.sdk.jd.PullRequest; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java index 15159ef9..7e94d567 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderAfterSaleController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderAfterSaleController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java index 4e6e7987..227f2774 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderApiController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderApiController.java @@ -1,6 +1,7 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; +import cn.qihangerp.api.jd.JdApiCommon; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; @@ -15,12 +16,12 @@ import cn.qihangerp.module.open.jd.domain.JdOrderItem; import cn.qihangerp.module.open.jd.service.JdOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; -import cn.qihangerp.open.PullRequest; + import cn.qihangerp.open.common.ApiResultVo; -import cn.qihangerp.open.jd.JdApiCommon; import cn.qihangerp.open.jd.JdOrderApiHelper; import cn.qihangerp.open.jd.response.JdOrderDetailResponse; import cn.qihangerp.open.jd.response.JdOrderListResponse; +import cn.qihangerp.sdk.jd.PullRequest; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.RequestBody; @@ -192,7 +193,7 @@ public class JdOrderApiController { String serverUrl = checkResult.getData().getServerUrl(); String appKey = checkResult.getData().getAppKey(); String appSecret = checkResult.getData().getAppSecret(); - ApiResultVo upResult = JdOrderApiHelper.pullOrderDetail(params.getOrderId(),appKey,appSecret,accessToken); + ApiResultVo upResult = JdOrderApiHelper.pullOrderDetail(Long.parseLong(params.getOrderId()),appKey,appSecret,accessToken); if(upResult.getCode() == ResultVoEnum.SUCCESS.getIndex()){ JdOrder jdOrder = new JdOrder(); BeanUtils.copyProperties(jdOrder,upResult.getData()); diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java index 529b95ab..1bb58cda 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/JdOrderController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/JdOrderController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd.controller; +package cn.qihangerp.api.jd.controller; import cn.qihangerp.common.AjaxResult; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdOrderFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java similarity index 96% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdOrderFeignController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java index b83d3d36..b2526e1f 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdOrderFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdOrderFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd.controller.feign; +package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.jd.domain.JdOrder; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdRefundFeignController.java b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java similarity index 96% rename from api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdRefundFeignController.java rename to microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java index ece83b96..f62bd726 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/jd/controller/feign/JdRefundFeignController.java +++ b/microservices/jd-api/src/main/java/cn/qihangerp/api/jd/controller/feign/JdRefundFeignController.java @@ -1,4 +1,4 @@ -package cn.qihangerp.open.jd.controller.feign; +package cn.qihangerp.api.jd.controller.feign; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.module.open.jd.domain.JdRefund; diff --git a/microservices/jd-api/src/main/resources/META-INF/spring.factories b/microservices/jd-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..818dc946 --- /dev/null +++ b/microservices/jd-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/jd-api/src/main/resources/application.yml b/microservices/jd-api/src/main/resources/application.yml new file mode 100644 index 00000000..35bc8f62 --- /dev/null +++ b/microservices/jd-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/jd-api/src/main/resources/banner.txt b/microservices/jd-api/src/main/resources/banner.txt new file mode 100644 index 00000000..b2d3f138 --- /dev/null +++ b/microservices/jd-api/src/main/resources/banner.txt @@ -0,0 +1,10 @@ +Application Version: 2.4.21 +Spring Boot Version: ${spring-boot.version} + _______ _________ _______ _ _______ _______ _______ _______ +( ___ )\__ __/|\ /|( ___ )( ( /|( ____ \( ____ \( ____ )( ____ ) +| ( ) | ) ( | ) ( || ( ) || \ ( || ( \/| ( \/| ( )|| ( )| +| | | | | | | (___) || (___) || \ | || | | (__ | (____)|| (____)| +| | | | | | | ___ || ___ || (\ \) || | ____ | __) | __)| _____) +| | /\| | | | | ( ) || ( ) || | \ || | \_ )| ( | (\ ( | ( +| (_\ \ |___) (___| ) ( || ) ( || ) \ || (___) || (____/\| ) \ \__| ) +(____\/_)\_______/|/ \||/ \||/ )_)(_______)(_______/|/ \__/|/ diff --git a/microservices/pom.xml b/microservices/pom.xml index fcea2859..13401ad0 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -18,6 +18,8 @@ goods-api order-api + jd-api + dou-api diff --git a/module/dou/pom.xml b/module/dou/pom.xml new file mode 100644 index 00000000..ed9c113b --- /dev/null +++ b/module/dou/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + cn.qihangerp.module + module + 1.0 + + cn.qihangerp.module + dou + jar + + dou + 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/dou/domain/DouGoods.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java index d74965b0..6069051c 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoods.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.dou.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** * 抖店商品表 * @TableName dou_goods diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java index 4d216025..db343641 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouGoodsSku.java @@ -1,10 +1,10 @@ package cn.qihangerp.module.open.dou.domain; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; + /** * 抖店商品Sku表 * @TableName dou_goods_sku diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java index 58c87633..e58ddbb2 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrder.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.dou.domain; -import java.io.Serializable; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + /** * 抖店订单表 * @TableName dou_order diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java index 9310deeb..1a302ef2 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouOrderItem.java @@ -1,10 +1,10 @@ package cn.qihangerp.module.open.dou.domain; -import java.io.Serializable; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; + /** * 抖店订单明细表 * @TableName dou_order_item diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java index 606286b7..31722964 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/DouRefund.java @@ -1,11 +1,11 @@ package cn.qihangerp.module.open.dou.domain; -import java.io.Serializable; -import java.util.Date; - import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; +import java.util.Date; + /** * 抖店退款表 * @TableName dou_refund diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java similarity index 97% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java index ed4eb215..66a9a89c 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoods.java @@ -1,4 +1,4 @@ -//package cn.qihangerp.dou.domain; +package cn.qihangerp.module.open.dou.domain;//package cn.qihangerp.dou.domain; // //import java.io.Serializable; //import java.math.BigDecimal; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java similarity index 96% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java index 3a863a1b..1f5dbeb3 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/OGoodsSku.java @@ -1,4 +1,4 @@ -//package cn.qihangerp.dou.domain; +package cn.qihangerp.module.open.dou.domain;//package cn.qihangerp.dou.domain; // //import java.io.Serializable; //import java.math.BigDecimal; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouGoodsBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouOrderPushBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/bo/DouRefundBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/domain/vo/DouGoodsSkuListVo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java index 8555fe10..5f89ec42 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java @@ -2,10 +2,9 @@ package cn.qihangerp.module.open.dou.mapper; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo; +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/dou/mapper/DouOrderItemMapper.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java index e92e3379..81517aeb 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java @@ -3,7 +3,6 @@ package cn.qihangerp.module.open.dou.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; - import cn.qihangerp.module.open.dou.domain.DouGoods; import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java index e022d554..9fd2b26e 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java @@ -2,7 +2,6 @@ package cn.qihangerp.module.open.dou.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; - import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java index f0c4d5e7..baec9ce6 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java @@ -3,7 +3,6 @@ package cn.qihangerp.module.open.dou.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; - import cn.qihangerp.module.open.dou.domain.DouOrder; import cn.qihangerp.module.open.dou.domain.bo.DouOrderBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java index 8de2bb6b..50b7ecea 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java @@ -3,7 +3,6 @@ package cn.qihangerp.module.open.dou.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; - import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.domain.bo.DouRefundBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java index 13d945bd..db63f49e 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java @@ -1,7 +1,10 @@ package cn.qihangerp.module.open.dou.service.impl; - +import cn.qihangerp.common.PageQuery; +import cn.qihangerp.common.PageResult; +import cn.qihangerp.common.ResultVo; +import cn.qihangerp.common.utils.StringUtils; import cn.qihangerp.module.goods.domain.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.open.dou.domain.DouGoods; @@ -13,13 +16,6 @@ import cn.qihangerp.module.open.dou.service.DouGoodsService; 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.ResultVo; -import cn.qihangerp.common.utils.StringUtils; - - - 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/dou/service/impl/DouGoodsSkuServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java index 54f2e5a6..a0bedeb3 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java @@ -1,15 +1,14 @@ package cn.qihangerp.module.open.dou.service.impl; -import cn.qihangerp.module.open.dou.domain.DouGoodsSku; -import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; -import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; -import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; -import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo; -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 cn.qihangerp.module.open.dou.domain.DouGoodsSku; +import cn.qihangerp.module.open.dou.domain.bo.DouGoodsBo; +import cn.qihangerp.module.open.dou.domain.vo.DouGoodsSkuListVo; +import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; +import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; +import com.baomidou.mybatisplus.core.metadata.IPage; +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/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java index 658b1933..59d97d5e 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java @@ -4,7 +4,6 @@ import cn.qihangerp.module.open.dou.domain.DouOrderItem; import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper; import cn.qihangerp.module.open.dou.service.DouOrderItemService; 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/dou/service/impl/DouOrderServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java similarity index 98% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java index 8a499690..c7655d61 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java @@ -1,6 +1,11 @@ package cn.qihangerp.module.open.dou.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.common.utils.DateUtils; import cn.qihangerp.module.open.dou.domain.DouGoodsSku; import cn.qihangerp.module.open.dou.domain.DouOrder; import cn.qihangerp.module.open.dou.domain.DouOrderItem; @@ -12,12 +17,6 @@ import cn.qihangerp.module.open.dou.service.DouOrderService; 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.ResultVo; -import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.common.utils.DateUtils; - import lombok.AllArgsConstructor; import lombok.extern.java.Log; import org.springframework.stereotype.Service; @@ -50,7 +49,7 @@ public class DouOrderServiceImpl extends ServiceImpl public PageResult queryPageList(DouOrderBo bo, PageQuery pageQuery) { long startTimeStamp = 0; long endTimeStamp = 0; - 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){ @@ -58,7 +57,7 @@ public class DouOrderServiceImpl extends ServiceImpl startTimeStamp = DateUtils.dateTimeStrToTimeStamp(null,bo.getStartTime()); } } - 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){ diff --git a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java rename to module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java index e656adc7..328c4b87 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java +++ b/module/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java @@ -1,6 +1,10 @@ package cn.qihangerp.module.open.dou.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.dou.domain.DouOrderItem; import cn.qihangerp.module.open.dou.domain.DouRefund; import cn.qihangerp.module.open.dou.domain.bo.DouRefundBo; @@ -10,11 +14,6 @@ import cn.qihangerp.module.open.dou.service.DouRefundService; 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.ResultVo; -import cn.qihangerp.common.ResultVoEnum; - import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/module/open/src/main/resources/mapper/dou/DouGoodsMapper.xml b/module/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/dou/DouGoodsMapper.xml rename to module/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml diff --git a/module/open/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml b/module/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml rename to module/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml diff --git a/module/open/src/main/resources/mapper/dou/DouOrderItemMapper.xml b/module/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/dou/DouOrderItemMapper.xml rename to module/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml diff --git a/module/open/src/main/resources/mapper/dou/DouOrderMapper.xml b/module/dou/src/main/resources/mapper/dou/DouOrderMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/dou/DouOrderMapper.xml rename to module/dou/src/main/resources/mapper/dou/DouOrderMapper.xml diff --git a/module/open/src/main/resources/mapper/dou/DouRefundMapper.xml b/module/dou/src/main/resources/mapper/dou/DouRefundMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/dou/DouRefundMapper.xml rename to module/dou/src/main/resources/mapper/dou/DouRefundMapper.xml diff --git a/module/jd/pom.xml b/module/jd/pom.xml new file mode 100644 index 00000000..8bdd8f2f --- /dev/null +++ b/module/jd/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + cn.qihangerp.module + module + 1.0 + + cn.qihangerp.module + jd + jar + + jd + 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/jd/domain/JdGoods.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoods.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdGoodsSku.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrder.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderAfter.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderCoupon.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdOrderItem.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdRefund.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcGoods.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrder.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcOrderItem.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrder.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcPurchaseOrderItem.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/JdVcRefund.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdAfterBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdGoodsBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdOrderPushBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdTokenCreateBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/bo/JdVcRefundBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/domain/vo/JdGoodsSkuListVo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdGoodsSkuMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderAfterMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderCouponMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdRefundMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcGoodsMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcPurchaseOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcRefundMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/mapper/JdVcReturnMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdGoodsSkuService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderAfterService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderCouponService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdOrderService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdRefundService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcGoodsService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcOrderService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcPurchaseOrderService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcRefundService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/JdVcReturnService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderAfterServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderCouponServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderItemServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdRefundServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcGoodsServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderItemServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcOrderServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderItemServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcPurchaseOrderServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcRefundServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnItemServiceImpl.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java b/module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java rename to module/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdVcReturnServiceImpl.java diff --git a/module/open/src/main/resources/mapper/jd/JdGoodsMapper.xml b/module/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdGoodsMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdGoodsMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml b/module/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdGoodsSkuMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdOrderCouponMapper.xml b/module/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdOrderCouponMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdOrderCouponMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdOrderItemMapper.xml b/module/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdOrderItemMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdOrderMapper.xml b/module/jd/src/main/resources/mapper/jd/JdOrderMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdOrderMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdOrderMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdRefundMapper.xml b/module/jd/src/main/resources/mapper/jd/JdRefundMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdRefundMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdRefundMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdVcGoodsMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdVcGoodsMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdVcGoodsMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdVcOrderItemMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdVcOrderMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdVcOrderMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdVcOrderMapper.xml diff --git a/module/open/src/main/resources/mapper/jd/JdVcRefundMapper.xml b/module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/jd/JdVcRefundMapper.xml rename to module/jd/src/main/resources/mapper/jd/JdVcRefundMapper.xml diff --git a/module/pom.xml b/module/pom.xml index d5bad703..83adc7c8 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -21,6 +21,8 @@ shop open stock + jd + dou