diff --git a/api/open-api/pom.xml b/api/open-api/pom.xml index 23e016d1..34791dfb 100644 --- a/api/open-api/pom.xml +++ b/api/open-api/pom.xml @@ -114,7 +114,11 @@ tao-api 1.0.6 - + + cn.qihangerp.services + pdd-api + 1.0.6 + diff --git a/microservices/pdd-api/libs/open-sdk-1.4.20.jar b/microservices/pdd-api/libs/open-sdk-1.4.20.jar new file mode 100644 index 00000000..83a202a4 Binary files /dev/null and b/microservices/pdd-api/libs/open-sdk-1.4.20.jar differ diff --git a/microservices/pdd-api/pom.xml b/microservices/pdd-api/pom.xml new file mode 100644 index 00000000..4919fd4a --- /dev/null +++ b/microservices/pdd-api/pom.xml @@ -0,0 +1,34 @@ + + 4.0.0 + + cn.qihangerp.services + microservices + 1.0.6 + + + pdd-api + jar + + pdd-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 + pdd + 1.0 + + + diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiAutoConfiguration.java new file mode 100644 index 00000000..8919b857 --- /dev/null +++ b/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 { +} diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/ApiCommon.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/ApiCommon.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddApiCommon.java index 6a6f7c7d..5fe2b620 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/ApiCommon.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/TokenCreateBo.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java similarity index 63% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/TokenCreateBo.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddTokenCreateBo.java index 169e5652..6c7128b9 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/TokenCreateBo.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java similarity index 96% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java index 1408fbe6..2c21e2cd 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsApiController.java +++ b/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()); } diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java index 96329704..7d7fca46 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddGoodsController.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java similarity index 93% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOAuthController.java index 52eb8de6..86e03698 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOAuthController.java +++ b/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()); diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java similarity index 98% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java index d193a219..095ca929 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderApiController.java +++ b/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()); } diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java index d2ce89cb..bf8ace0f 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddOrderController.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java similarity index 96% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java index d3367709..a384c696 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundApiController.java +++ b/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()); } diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java similarity index 97% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java index 858085c2..4eed1057 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/PddRefundController.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/OrderFeignController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java similarity index 94% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/OrderFeignController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java index 4e5c95c8..51bdfeff 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/OrderFeignController.java +++ b/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; diff --git a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/RefundFeignController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java similarity index 94% rename from api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/RefundFeignController.java rename to microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java index 7159d0e6..cce89327 100644 --- a/api/open-api/src/main/java/cn/qihangerp/open/pdd/controller/feign/RefundFeignController.java +++ b/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; diff --git a/microservices/pdd-api/src/main/resources/META-INF/spring.factories b/microservices/pdd-api/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..c4809a9a --- /dev/null +++ b/microservices/pdd-api/src/main/resources/META-INF/spring.factories @@ -0,0 +1 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.qihangerp.api.pdd.PddApiAutoConfiguration \ No newline at end of file diff --git a/microservices/pdd-api/src/main/resources/application.yml b/microservices/pdd-api/src/main/resources/application.yml new file mode 100644 index 00000000..35bc8f62 --- /dev/null +++ b/microservices/pdd-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/pdd-api/src/main/resources/banner.txt b/microservices/pdd-api/src/main/resources/banner.txt new file mode 100644 index 00000000..b2d3f138 --- /dev/null +++ b/microservices/pdd-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 c8fa7d43..2fb07aee 100644 --- a/microservices/pom.xml +++ b/microservices/pom.xml @@ -21,6 +21,7 @@ jd-api dou-api tao-api + pdd-api diff --git a/module/pdd/pom.xml b/module/pdd/pom.xml new file mode 100644 index 00000000..9ec27cfb --- /dev/null +++ b/module/pdd/pom.xml @@ -0,0 +1,39 @@ + + 4.0.0 + + cn.qihangerp.module + module + 1.0 + + + pdd + jar + + pdd + 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/pdd/domain/PddGoods.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java index 35353968..2662ae0d 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java +++ b/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 diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java index f5e095b5..64c4f216 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java +++ b/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 diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java index 38b41873..8e495e69 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java +++ b/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 diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java index 3a9757ff..b9baccd2 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java +++ b/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 diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java index fbce22ad..5c8d236d 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java +++ b/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 diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java index 2957ba07..6529741c 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java +++ b/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; /** diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java index f0b0eeb7..38ea86b1 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java index ba64154e..bb11e11b 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java similarity index 100% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java index 7ae55fe0..adba5edf 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java index 6f667913..e32a7784 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java index 8f357bfe..c11ce6aa 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java index 94537482..721f5193 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java +++ b/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; diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java index bafc1a5e..81512fff 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java +++ b/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; /** diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java similarity index 98% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java index fa29ad34..6f720455 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/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 private final Pattern DATE_FORMAT = Pattern.compile(DATE_PATTERN); @Override public PageResult 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){ diff --git a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java b/module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java similarity index 99% rename from module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java rename to module/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java index f2c2e965..64d8c552 100644 --- a/module/open/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java +++ 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; diff --git a/module/open/src/main/resources/mapper/pdd/PddGoodsMapper.xml b/module/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/pdd/PddGoodsMapper.xml rename to module/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml diff --git a/module/open/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml b/module/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml rename to module/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml diff --git a/module/open/src/main/resources/mapper/pdd/PddOrderItemMapper.xml b/module/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/pdd/PddOrderItemMapper.xml rename to module/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml diff --git a/module/open/src/main/resources/mapper/pdd/PddOrderMapper.xml b/module/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/pdd/PddOrderMapper.xml rename to module/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml diff --git a/module/open/src/main/resources/mapper/pdd/PddRefundMapper.xml b/module/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml similarity index 100% rename from module/open/src/main/resources/mapper/pdd/PddRefundMapper.xml rename to module/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml diff --git a/module/pom.xml b/module/pom.xml index ba0e51ee..bce8efa5 100644 --- a/module/pom.xml +++ b/module/pom.xml @@ -24,6 +24,7 @@ jd dou tao + pdd