分离open项目

api/open-api/pom.xml

@@ -97,6 +97,19 @@
             <version>1.18.30</version>
             <scope>provided</scope>
         </dependency>
+
+
+        <dependency>
+            <groupId>cn.qihangerp.services</groupId>
+            <artifactId>jd-api</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.services</groupId>
+            <artifactId>dou-api</artifactId>
+            <version>1.0.6</version>
+        </dependency>
+
         <dependency>
             <groupId>cn.qihangerp.module</groupId>
             <artifactId>open</artifactId>

microservices/dou-api/pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.qihangerp.services</groupId>
+        <artifactId>microservices</artifactId>
+        <version>1.0.6</version>
+    </parent>
+
+    <artifactId>dou-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>dou-api</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.open</groupId>
+            <artifactId>open-sdk</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/open-sdk-1.4.20.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>dou</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

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 {
+}

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;

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;

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;

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;

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;

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;

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;

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;

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;

microservices/dou-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration

microservices/dou-api/src/main/resources/application.yml

@@ -0,0 +1,4 @@
+qihangerp:
+  name: 启航电商ERP
+  goods:
+    version: 2.4.21

microservices/dou-api/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Application Version: 2.4.21
+Spring Boot Version: ${spring-boot.version}
+ _______ _________          _______  _        _______  _______  _______  _______
+(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
+| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
+| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
+| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
+| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
+| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
+(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/jd-api/pom.xml

@@ -0,0 +1,34 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.qihangerp.services</groupId>
+        <artifactId>microservices</artifactId>
+        <version>1.0.6</version>
+    </parent>
+
+    <artifactId>jd-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>jd-api</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.open</groupId>
+            <artifactId>open-sdk</artifactId>
+            <version>1.0.2</version>
+            <scope>system</scope>
+            <systemPath>${project.basedir}/libs/open-sdk-1.4.20.jar</systemPath>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>jd</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

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 {
+}

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;

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;

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;

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;

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;

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;

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<JdOrderDetailResponse> upResult = JdOrderApiHelper.pullOrderDetail(params.getOrderId(),appKey,appSecret,accessToken);
+        ApiResultVo<JdOrderDetailResponse> 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());

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;

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;

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;

microservices/jd-api/src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.jd.JdApiAutoConfiguration

microservices/jd-api/src/main/resources/application.yml

@@ -0,0 +1,4 @@
+qihangerp:
+  name: 启航电商ERP
+  goods:
+    version: 2.4.21

microservices/jd-api/src/main/resources/banner.txt

@@ -0,0 +1,10 @@
+Application Version: 2.4.21
+Spring Boot Version: ${spring-boot.version}
+ _______ _________          _______  _        _______  _______  _______  _______
+(  ___  )\__   __/|\     /|(  ___  )( (    /|(  ____ \(  ____ \(  ____ )(  ____ )
+| (   ) |   ) (   | )   ( || (   ) ||  \  ( || (    \/| (    \/| (    )|| (    )|
+| |   | |   | |   | (___) || (___) ||   \ | || |      | (__    | (____)|| (____)|
+| |   | |   | |   |  ___  ||  ___  || (\ \) || | ____ |  __)   |     __)|  _____)
+| | /\| |   | |   | (   ) || (   ) || | \   || | \_  )| (      | (\ (   | (
+| (_\ \ |___) (___| )   ( || )   ( || )  \  || (___) || (____/\| ) \ \__| )
+(____\/_)\_______/|/     \||/     \||/    )_)(_______)(_______/|/   \__/|/

microservices/pom.xml

@@ -18,6 +18,8 @@
     <modules>
         <module>goods-api</module>
         <module>order-api</module>
+        <module>jd-api</module>
+        <module>dou-api</module>
     </modules>
 
     <properties>

module/dou/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.qihangerp.module</groupId>
+        <artifactId>module</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>cn.qihangerp.module</groupId>
+    <artifactId>dou</artifactId>
+    <packaging>jar</packaging>
+
+    <name>dou</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.core</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>goods</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.5</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

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

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

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

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

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

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;

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;

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;
 
 /**

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;

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;

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;

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;

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;

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;

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;
 
 /**

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<DouOrderMapper, DouOrder>
     public PageResult<DouOrder> 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<DouOrderMapper, DouOrder>
                 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){

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;

module/jd/pom.xml

@@ -0,0 +1,39 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>cn.qihangerp.module</groupId>
+        <artifactId>module</artifactId>
+        <version>1.0</version>
+    </parent>
+    <groupId>cn.qihangerp.module</groupId>
+    <artifactId>jd</artifactId>
+    <packaging>jar</packaging>
+
+    <name>jd</name>
+    <url>http://maven.apache.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cn.qihangerp.core</groupId>
+            <artifactId>common</artifactId>
+            <version>1.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cn.qihangerp.module</groupId>
+            <artifactId>goods</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
+            <version>3.5.5</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>