分离pdd-api

api/open-api/pom.xml

@@ -114,7 +114,11 @@
             <artifactId>tao-api</artifactId>
             <version>1.0.6</version>
         </dependency>
-
+        <dependency>
+            <groupId>cn.qihangerp.services</groupId>
+            <artifactId>pdd-api</artifactId>
+            <version>1.0.6</version>
+        </dependency>
 
 
 

microservices/pdd-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>pdd-api</artifactId>
+    <packaging>jar</packaging>
+
+    <name>pdd-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>pdd</artifactId>
+            <version>1.0</version>
+        </dependency>
+    </dependencies>
+</project>

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java

@@ -0,0 +1,18 @@
+package cn.qihangerp.api.pdd;
+
+//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 = PddApiAutoConfiguration.class))
+public class PddApiAutoConfiguration {
+}

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.pdd;
+package cn.qihangerp.api.pdd;
 
 import cn.qihangerp.common.ResultVo;
 import cn.qihangerp.common.ResultVoEnum;
@@ -14,7 +14,7 @@ import org.springframework.util.StringUtils;
 
 @AllArgsConstructor
 @Component
-public class ApiCommon {
+public class PddApiCommon {
     private final OShopService shopService;
     private final OShopPlatformService platformService;
 

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java

@@ -1,9 +1,9 @@
-package cn.qihangerp.open.pdd;
+package cn.qihangerp.api.pdd;
 
 import lombok.Data;
 
 @Data
-public class TokenCreateBo {
+public class PddTokenCreateBo {
     private Long shopId;
     private Integer shopType;
     private String code;

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java

@@ -1,6 +1,7 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
+import cn.qihangerp.api.pdd.PddApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.common.enums.HttpStatus;
@@ -11,11 +12,12 @@ import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 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.pdd.ApiCommon;
+
 import cn.qihangerp.open.pdd.PddGoodsApiHelper;
 import cn.qihangerp.open.pdd.model.GoodsResultVo;
+import cn.qihangerp.sdk.pdd.PullRequest;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,7 +34,7 @@ import java.util.List;
 @RestController
 @AllArgsConstructor
 public class PddGoodsApiController {
-    private final ApiCommon apiCommon;
+    private final PddApiCommon pddApiCommon;
     private final PddGoodsService goodsService;
     private final OShopPullLogsService pullLogsService;
     private final OShopPullLasttimeService pullLasttimeService;
@@ -52,7 +54,7 @@ public class PddGoodsApiController {
         }
         Long currTimeMillis = System.currentTimeMillis();
         Date currDateTime = new Date();
-        var checkResult = apiCommon.checkBefore(params.getShopId());
+        var checkResult = pddApiCommon.checkBefore(params.getShopId());
         if (checkResult.getCode() != HttpStatus.SUCCESS) {
             return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(), checkResult.getData());
         }

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java

@@ -1,12 +1,10 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.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.pdd.domain.bo.PddGoodsBo;
 import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
 import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;
-
 import cn.qihangerp.security.common.BaseController;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java

@@ -1,7 +1,8 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
 
+import cn.qihangerp.api.pdd.PddTokenCreateBo;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.enums.EnumShopType;
 import cn.qihangerp.domain.OShopPlatform;
@@ -9,7 +10,7 @@ import cn.qihangerp.module.service.OShopPlatformService;
 import cn.qihangerp.module.service.OShopService;
 import cn.qihangerp.open.common.ApiResultVo;
 import cn.qihangerp.open.pdd.PddTokenApiHelper;
-import cn.qihangerp.open.pdd.TokenCreateBo;
+
 import cn.qihangerp.open.pdd.model.Token;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
@@ -44,7 +45,7 @@ public class PddOAuthController {
     }
 
     @PostMapping("/getToken")
-    public AjaxResult getToken(@RequestBody TokenCreateBo bo) throws IOException, InterruptedException {
+    public AjaxResult getToken(@RequestBody PddTokenCreateBo bo) throws IOException, InterruptedException {
         log.info("/**********获取拼多多授权token*********/");
         var shop = shopService.selectShopById(bo.getShopId());
         OShopPlatform platform = platformService.selectById(EnumShopType.PDD.getIndex());

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java

@@ -1,6 +1,7 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
+import cn.qihangerp.api.pdd.PddApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -15,11 +16,12 @@ import cn.qihangerp.module.open.pdd.domain.PddOrderItem;
 import cn.qihangerp.module.open.pdd.service.PddOrderService;
 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.pdd.ApiCommon;
+
 import cn.qihangerp.open.pdd.PddOrderApiHelper;
 import cn.qihangerp.open.pdd.model.OrderListResultVo;
+import cn.qihangerp.sdk.pdd.PullRequest;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,7 +46,7 @@ public class PddOrderApiController {
     private static Logger log = LoggerFactory.getLogger(PddOrderApiController.class);
 
     private final PddOrderService orderService;
-    private final ApiCommon apiCommon;
+    private final PddApiCommon pddApiCommon;
     private final MqUtils mqUtils;
     private final OShopPullLogsService pullLogsService;
     private final OShopPullLasttimeService pullLasttimeService;
@@ -64,7 +66,7 @@ public class PddOrderApiController {
         Date currDateTime = new Date();
         long beginTime = System.currentTimeMillis();
 
-        var checkResult = apiCommon.checkBefore(req.getShopId());
+        var checkResult = pddApiCommon.checkBefore(req.getShopId());
         if (checkResult.getCode() != HttpStatus.SUCCESS) {
             return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(),checkResult.getData());
         }

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java

@@ -1,6 +1,7 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
+import cn.qihangerp.api.pdd.PddApiCommon;
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.common.ResultVoEnum;
 import cn.qihangerp.common.enums.EnumShopType;
@@ -14,11 +15,12 @@ import cn.qihangerp.module.open.pdd.domain.PddRefund;
 import cn.qihangerp.module.open.pdd.service.PddRefundService;
 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.pdd.ApiCommon;
+
 import cn.qihangerp.open.pdd.PddRefundApiHelper;
 import cn.qihangerp.open.pdd.model.AfterSale;
+import cn.qihangerp.sdk.pdd.PullRequest;
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,7 +41,7 @@ public class PddRefundApiController {
     private static Logger log = LoggerFactory.getLogger(PddRefundApiController.class);
 
     private final PddRefundService refundService;
-    private final ApiCommon apiCommon;
+    private final PddApiCommon pddApiCommon;
     private final MqUtils mqUtils;
     private final OShopPullLogsService pullLogsService;
     private final OShopPullLasttimeService pullLasttimeService;
@@ -59,7 +61,7 @@ public class PddRefundApiController {
         Date currDateTime = new Date();
         long beginTime = System.currentTimeMillis();
 
-        var checkResult = apiCommon.checkBefore(req.getShopId());
+        var checkResult = pddApiCommon.checkBefore(req.getShopId());
         if (checkResult.getCode() != HttpStatus.SUCCESS) {
             return AjaxResult.error(checkResult.getCode(), checkResult.getMsg(),checkResult.getData());
         }

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.pdd.controller;
+package cn.qihangerp.api.pdd.controller;
 
 
 import cn.qihangerp.common.AjaxResult;

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.pdd.controller.feign;
+package cn.qihangerp.api.pdd.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.pdd.domain.PddOrder;

microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java

@@ -1,4 +1,4 @@
-package cn.qihangerp.open.pdd.controller.feign;
+package cn.qihangerp.api.pdd.controller.feign;
 
 import cn.qihangerp.common.AjaxResult;
 import cn.qihangerp.module.open.pdd.domain.PddRefund;

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

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

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

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

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

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

microservices/pom.xml

@@ -21,6 +21,7 @@
         <module>jd-api</module>
         <module>dou-api</module>
         <module>tao-api</module>
+        <module>pdd-api</module>
     </modules>
 
     <properties>

module/pdd/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>
+
+    <artifactId>pdd</artifactId>
+    <packaging>jar</packaging>
+
+    <name>pdd</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/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java

@@ -1,13 +1,13 @@
 package cn.qihangerp.module.open.pdd.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;
+
 /**
  * pdd商品表
  * @TableName pdd_goods

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java

@@ -1,11 +1,11 @@
 package cn.qihangerp.module.open.pdd.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;
+
 /**
  * pdd商品SKU表
  * @TableName pdd_goods_sku

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java

@@ -1,13 +1,13 @@
 package cn.qihangerp.module.open.pdd.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 pdd_order

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java

@@ -1,10 +1,10 @@
 package cn.qihangerp.module.open.pdd.domain;
 
-import java.io.Serializable;
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.io.Serializable;
+
 /**
  * 拼多多订单明细表
  * @TableName pdd_order_item

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java

@@ -1,11 +1,11 @@
 package cn.qihangerp.module.open.pdd.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 pdd_refund

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java

@@ -2,11 +2,9 @@ package cn.qihangerp.module.open.pdd.mapper;
 
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
+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/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java

@@ -3,7 +3,6 @@ package cn.qihangerp.module.open.pdd.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-
 import cn.qihangerp.module.open.pdd.domain.PddGoods;
 import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
 import com.baomidou.mybatisplus.extension.service.IService;

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java

@@ -2,7 +2,6 @@ package cn.qihangerp.module.open.pdd.service;
 
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
-
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
 import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java

@@ -3,7 +3,6 @@ package cn.qihangerp.module.open.pdd.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-
 import cn.qihangerp.module.open.pdd.domain.PddOrder;
 import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo;
 import com.baomidou.mybatisplus.extension.service.IService;

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java

@@ -3,7 +3,6 @@ package cn.qihangerp.module.open.pdd.service;
 import cn.qihangerp.common.PageQuery;
 import cn.qihangerp.common.PageResult;
 import cn.qihangerp.common.ResultVo;
-
 import cn.qihangerp.module.open.pdd.domain.PddRefund;
 import cn.qihangerp.module.open.pdd.domain.bo.PddRefundBo;
 import com.baomidou.mybatisplus.extension.service.IService;

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.qihangerp.module.open.pdd.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.pdd.domain.PddGoods;
@@ -12,12 +16,6 @@ import cn.qihangerp.module.open.pdd.service.PddGoodsService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java

@@ -1,5 +1,7 @@
 package cn.qihangerp.module.open.pdd.service.impl;
 
+import cn.qihangerp.common.PageQuery;
+import cn.qihangerp.common.PageResult;
 import cn.qihangerp.module.open.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo;
 import cn.qihangerp.module.open.pdd.domain.vo.PddGoodsSkuListVo;
@@ -7,9 +9,6 @@ import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
 import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.PageResult;
-
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java

@@ -4,7 +4,6 @@ import cn.qihangerp.module.open.pdd.domain.PddOrderItem;
 import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper;
 import cn.qihangerp.module.open.pdd.service.PddOrderItemService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
 import org.springframework.stereotype.Service;
 
 /**

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.qihangerp.module.open.pdd.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.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.PddOrder;
 import cn.qihangerp.module.open.pdd.domain.PddOrderItem;
@@ -12,11 +16,6 @@ import cn.qihangerp.module.open.pdd.service.PddOrderService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import cn.qihangerp.common.PageQuery;
-import cn.qihangerp.common.PageResult;
-import cn.qihangerp.common.ResultVo;
-import cn.qihangerp.common.ResultVoEnum;
-
 import lombok.AllArgsConstructor;
 import lombok.extern.java.Log;
 import org.springframework.stereotype.Service;
@@ -47,14 +46,14 @@ public class PddOrderServiceImpl extends ServiceImpl<PddOrderMapper, PddOrder>
     private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN);
     @Override
     public PageResult<PddOrder> queryPageList(PddOrderBo bo, PageQuery pageQuery) {
-        if(org.springframework.util.StringUtils.hasText(bo.getStartTime())){
+        if(StringUtils.hasText(bo.getStartTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getStartTime());
             boolean b = matcher.find();
             if(b){
                 bo.setStartTime(bo.getStartTime()+" 00:00:00");
             }
         }
-        if(org.springframework.util.StringUtils.hasText(bo.getEndTime())){
+        if(StringUtils.hasText(bo.getEndTime())){
             Matcher matcher = DATE_FORMAT.matcher(bo.getEndTime());
             boolean b = matcher.find();
             if(b){

module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java

@@ -1,6 +1,10 @@
 package cn.qihangerp.module.open.pdd.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.pdd.domain.PddGoodsSku;
 import cn.qihangerp.module.open.pdd.domain.PddRefund;
 import cn.qihangerp.module.open.pdd.domain.bo.PddRefundBo;
@@ -10,11 +14,6 @@ import cn.qihangerp.module.open.pdd.service.PddRefundService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-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/pom.xml

@@ -24,6 +24,7 @@
         <module>jd</module>
         <module>dou</module>
         <module>tao</module>
+        <module>pdd</module>
 
     </modules>
     <properties>