diff --git a/core/mapper/src/main/java/cn/qihangerp/mapper/Main.java b/core/mapper/src/main/java/cn/qihangerp/mapper/Main.java deleted file mode 100644 index cdece012..00000000 --- a/core/mapper/src/main/java/cn/qihangerp/mapper/Main.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.qihangerp.mapper; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello, World!"); - } -} \ No newline at end of file diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java similarity index 88% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java index 53992f28..7d9c722f 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderBo.java similarity index 86% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/PddOrderBo.java index 29706830..45cf7243 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderConfirmBo.java similarity index 91% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/PddOrderConfirmBo.java index eb98dc38..57ce1e52 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderConfirmBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderPushBo.java similarity index 64% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/PddOrderPushBo.java index 3b6d733c..fa982a3e 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/PddOrderPushBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/PddRefundBo.java similarity index 78% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/PddRefundBo.java index 91b8217f..4055de16 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/PddRefundBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/PddGoods.java similarity index 97% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/PddGoods.java index 81da789b..20eb37d2 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/PddGoods.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/PddGoodsSku.java similarity index 97% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/PddGoodsSku.java index 5b338147..a3d268e5 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/PddGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java b/core/model/src/main/java/cn/qihangerp/model/entity/PddOrder.java similarity index 99% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java rename to core/model/src/main/java/cn/qihangerp/model/entity/PddOrder.java index ce6cbc66..7d494be1 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/PddOrder.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java b/core/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java similarity index 96% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java rename to core/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java index 036befbd..4bdbc818 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java b/core/model/src/main/java/cn/qihangerp/model/entity/PddRefund.java similarity index 98% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java rename to core/model/src/main/java/cn/qihangerp/model/entity/PddRefund.java index 97cd5358..51376fc6 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/PddRefund.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.pdd.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/PddGoodsSkuListVo.java similarity index 53% rename from serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/PddGoodsSkuListVo.java index 363ff20a..7292493b 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/PddGoodsSkuListVo.java @@ -1,6 +1,6 @@ -package cn.qihangerp.module.open.pdd.domain.vo; +package cn.qihangerp.model.vo; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; +import cn.qihangerp.model.entity.PddGoodsSku; import lombok.Data; @Data diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java index fcc03a6a..c472adb9 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java @@ -1,7 +1,5 @@ package cn.qihangerp.api.pdd; -import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.common.PullOrderResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; @@ -9,8 +7,8 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.pdd.domain.PddOrder; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; +import cn.qihangerp.model.entity.PddOrder; +import cn.qihangerp.model.entity.PddOrderItem; import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java index 5dd82dc3..286d7a80 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsApiController.java @@ -7,8 +7,8 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.pdd.domain.PddGoods; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; +import cn.qihangerp.model.entity.PddGoods; +import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java index 21a95d2f..01d5695c 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddGoodsController.java @@ -4,9 +4,9 @@ package cn.qihangerp.api.pdd.controller; import cn.qihangerp.common.*; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.pdd.domain.PddGoods; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; -import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo; +import cn.qihangerp.model.entity.PddGoods; +import cn.qihangerp.model.entity.PddGoodsSku; +import cn.qihangerp.model.bo.PddGoodsBo; import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService; import cn.qihangerp.security.common.BaseController; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java index 3cba9785..cdf69755 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderApiController.java @@ -9,10 +9,9 @@ import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.pdd.domain.PddOrder; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; +import cn.qihangerp.model.entity.PddOrder; +import cn.qihangerp.model.entity.PddOrderItem; import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; @@ -26,7 +25,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import java.time.Duration; + import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java index 7f923338..f3e7f387 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddOrderController.java @@ -9,10 +9,10 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.pdd.domain.PddOrder; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderPushBo; +import cn.qihangerp.model.entity.PddOrder; +import cn.qihangerp.model.bo.PddOrderBo; +import cn.qihangerp.model.bo.PddOrderConfirmBo; +import cn.qihangerp.model.bo.PddOrderPushBo; import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.security.common.BaseController; import com.alibaba.fastjson2.JSONObject; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java index 7ed60a14..cdd05141 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundApiController.java @@ -11,7 +11,7 @@ import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLogs; -import cn.qihangerp.module.open.pdd.domain.PddRefund; +import cn.qihangerp.model.entity.PddRefund; import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLogsService; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java index 4eed1057..227797e7 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/PddRefundController.java @@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqUtils; -import cn.qihangerp.module.open.pdd.domain.PddRefund; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderPushBo; -import cn.qihangerp.module.open.pdd.domain.bo.PddRefundBo; +import cn.qihangerp.model.entity.PddRefund; +import cn.qihangerp.model.bo.PddOrderPushBo; +import cn.qihangerp.model.bo.PddRefundBo; import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java index 51bdfeff..2f47a8f0 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/OrderFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.pdd.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.pdd.domain.PddOrder; +import cn.qihangerp.model.entity.PddOrder; import cn.qihangerp.module.open.pdd.service.PddOrderService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java index cce89327..046a0361 100644 --- a/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java +++ b/microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/controller/feign/RefundFeignController.java @@ -1,7 +1,7 @@ package cn.qihangerp.api.pdd.controller.feign; import cn.qihangerp.common.AjaxResult; -import cn.qihangerp.module.open.pdd.domain.PddRefund; +import cn.qihangerp.model.entity.PddRefund; import cn.qihangerp.module.open.pdd.service.PddRefundService; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java index d9353fad..fca059a8 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.pdd.mapper; -import cn.qihangerp.module.open.pdd.domain.PddGoods; +import cn.qihangerp.model.entity.PddGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_pdd_goods(pdd商品表)】的数据库操作Mapper * @createDate 2025-05-20 12:31:44 -* @Entity cn.qihangerp.module.open.pdd.domain.PddGoods +* @Entity cn.qihangerp.model.entity.PddGoods */ public interface PddGoodsMapper extends BaseMapper { diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java index 7575f2d5..5850bcef 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.open.pdd.mapper; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; +import cn.qihangerp.model.entity.PddGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【oms_pdd_goods_sku(pdd商品SKU表)】的数据库操作Mapper * @createDate 2025-05-20 12:30:47 -* @Entity cn.qihangerp.module.open.pdd.domain.PddGoodsSku +* @Entity cn.qihangerp.model.entity.PddGoodsSku */ public interface PddGoodsSkuMapper extends BaseMapper { diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java index f200f6da..a9fe2c80 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.pdd.mapper; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; +import cn.qihangerp.model.entity.PddOrderItem; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java index 5995e98d..b6a17ad4 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.pdd.mapper; -import cn.qihangerp.module.open.pdd.domain.PddOrder; +import cn.qihangerp.model.entity.PddOrder; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java index 760a67f0..35e3fd76 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.pdd.mapper; -import cn.qihangerp.module.open.pdd.domain.PddRefund; +import cn.qihangerp.model.entity.PddRefund; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java index b1ee54a1..4bcccdca 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java @@ -3,8 +3,8 @@ 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 cn.qihangerp.model.entity.PddGoods; +import cn.qihangerp.model.bo.PddGoodsBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java index d2ea6b50..ea7b0be3 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java @@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; +import cn.qihangerp.model.entity.PddGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java index 7e1ecc59..7ef41247 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.open.pdd.service; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; +import cn.qihangerp.model.entity.PddOrderItem; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java index 64547eaa..c3a0e493 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java @@ -3,9 +3,9 @@ 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 cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; +import cn.qihangerp.model.entity.PddOrder; +import cn.qihangerp.model.bo.PddOrderBo; +import cn.qihangerp.model.bo.PddOrderConfirmBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java index e32a7784..f427c10f 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java @@ -3,8 +3,8 @@ 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 cn.qihangerp.model.entity.PddRefund; +import cn.qihangerp.model.bo.PddRefundBo; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java index 20ecc856..a92c4046 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java @@ -12,9 +12,9 @@ import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; -import cn.qihangerp.module.open.pdd.domain.PddGoods; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; -import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo; +import cn.qihangerp.model.entity.PddGoods; +import cn.qihangerp.model.entity.PddGoodsSku; +import cn.qihangerp.model.bo.PddGoodsBo; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.service.PddGoodsService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java index 835eb31e..018c0042 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java @@ -8,8 +8,8 @@ import cn.qihangerp.model.entity.OGoods; import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; -import cn.qihangerp.module.open.pdd.domain.PddGoods; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; +import cn.qihangerp.model.entity.PddGoods; +import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java index 81512fff..c7566e21 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.open.pdd.service.impl; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; +import cn.qihangerp.model.entity.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; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java index eedcbe64..c903a8bc 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java @@ -6,18 +6,15 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.enums.EnumShopType; -import cn.qihangerp.common.utils.DateUtils; import cn.qihangerp.mapper.ErpOrderItemMapper; import cn.qihangerp.mapper.ErpOrderMapper; -import cn.qihangerp.model.entity.DouOrder; -import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrderItem; -import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; -import cn.qihangerp.module.open.pdd.domain.PddOrder; -import cn.qihangerp.module.open.pdd.domain.PddOrderItem; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; -import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; +import cn.qihangerp.model.entity.PddGoodsSku; +import cn.qihangerp.model.entity.PddOrder; +import cn.qihangerp.model.entity.PddOrderItem; +import cn.qihangerp.model.bo.PddOrderBo; +import cn.qihangerp.model.bo.PddOrderConfirmBo; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper; import cn.qihangerp.module.open.pdd.mapper.PddOrderMapper; @@ -32,9 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.util.StringUtils; -import java.time.Instant; import java.time.LocalDateTime; -import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.Date; import java.util.List; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java index 07c0c239..143db9af 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java @@ -5,9 +5,9 @@ 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; +import cn.qihangerp.model.entity.PddGoodsSku; +import cn.qihangerp.model.entity.PddRefund; +import cn.qihangerp.model.bo.PddRefundBo; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddRefundMapper; import cn.qihangerp.module.open.pdd.service.PddRefundService; diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml index 5d59fde7..a1967fc6 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml +++ b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml index 41e78ed3..5efa13b1 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml +++ b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml index a6f949b2..b029e4c3 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml +++ b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml index df6c0939..3772e29f 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml +++ b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml index 5b07b62c..1cb61f62 100644 --- a/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml +++ b/serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +