huangyujie
/
qihang-ecom-erp-open
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化项目结构

This commit is contained in:
启航老齐 2025-12-30 20:49:45 +08:00
parent ed64917ad6
commit 02092fb0c9
41 changed files with 67 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/mapper/src/main/java/cn/qihangerp/mapper/Main.java
View File

@ -1,7 +0,0 @@
package cn.qihangerp.mapper;
public class Main {
public static void main(String[] args) {
System.out.println("Hello, World!");
}
}

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddGoodsBo.java → core/model/src/main/java/cn/qihangerp/model/bo/PddGoodsBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.pdd.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderBo.java → core/model/src/main/java/cn/qihangerp/model/bo/PddOrderBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.pdd.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderConfirmBo.java → core/model/src/main/java/cn/qihangerp/model/bo/PddOrderConfirmBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.pdd.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddOrderPushBo.java → core/model/src/main/java/cn/qihangerp/model/bo/PddOrderPushBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.pdd.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/bo/PddRefundBo.java → core/model/src/main/java/cn/qihangerp/model/bo/PddRefundBo.java
View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.pdd.domain.bo; package cn.qihangerp.model.bo;
import lombok.Data; import lombok.Data;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoods.java → core/model/src/main/java/cn/qihangerp/model/entity/PddGoods.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddGoodsSku.java → core/model/src/main/java/cn/qihangerp/model/entity/PddGoodsSku.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrder.java → core/model/src/main/java/cn/qihangerp/model/entity/PddOrder.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddOrderItem.java → core/model/src/main/java/cn/qihangerp/model/entity/PddOrderItem.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/PddRefund.java → core/model/src/main/java/cn/qihangerp/model/entity/PddRefund.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/domain/vo/PddGoodsSkuListVo.java → core/model/src/main/java/cn/qihangerp/model/vo/PddGoodsSkuListVo.java
View File

@ -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; import lombok.Data;
@Data @Data

6
microservices/pdd-api/src/main/java/cn/qihangerp/api/pdd/PddOrderApiService.java
View File

@ -1,7 +1,5 @@
package cn.qihangerp.api.pdd; package cn.qihangerp.api.pdd;
import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PullOrderResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.mq.MqMessage; 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.common.mq.MqUtils;
import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.model.entity.PddOrder;
import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.model.entity.PddOrderItem;
import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.open.pdd.service.PddOrderService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;

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

@ -7,8 +7,8 @@ import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.enums.HttpStatus; import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;

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

@ -4,9 +4,9 @@ package cn.qihangerp.api.pdd.controller;
import cn.qihangerp.common.*; import cn.qihangerp.common.*;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo; import cn.qihangerp.model.bo.PddGoodsBo;
import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsService;
import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService; import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;

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

@ -9,10 +9,9 @@ import cn.qihangerp.common.enums.HttpStatus;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.model.entity.PddOrder;
import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.model.entity.PddOrderItem;
import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.open.pdd.service.PddOrderService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
@ -26,7 +25,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.time.Duration;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneOffset; import java.time.ZoneOffset;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;

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

@ -9,10 +9,10 @@ import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.model.entity.PddOrder;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; import cn.qihangerp.model.bo.PddOrderBo;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; import cn.qihangerp.model.bo.PddOrderConfirmBo;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderPushBo; import cn.qihangerp.model.bo.PddOrderPushBo;
import cn.qihangerp.module.open.pdd.service.PddOrderService; import cn.qihangerp.module.open.pdd.service.PddOrderService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;

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

@ -11,7 +11,7 @@ import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.OShopPullLasttime; import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; 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.open.pdd.service.PddRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;

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

@ -9,9 +9,9 @@ import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.mq.MqMessage; import cn.qihangerp.common.mq.MqMessage;
import cn.qihangerp.common.mq.MqType; import cn.qihangerp.common.mq.MqType;
import cn.qihangerp.common.mq.MqUtils; import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.module.open.pdd.domain.PddRefund; import cn.qihangerp.model.entity.PddRefund;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderPushBo; import cn.qihangerp.model.bo.PddOrderPushBo;
import cn.qihangerp.module.open.pdd.domain.bo.PddRefundBo; import cn.qihangerp.model.bo.PddRefundBo;
import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.module.open.pdd.service.PddRefundService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

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

@ -1,7 +1,7 @@
package cn.qihangerp.api.pdd.controller.feign; package cn.qihangerp.api.pdd.controller.feign;
import cn.qihangerp.common.AjaxResult; 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 cn.qihangerp.module.open.pdd.service.PddOrderService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

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

@ -1,7 +1,7 @@
package cn.qihangerp.api.pdd.controller.feign; package cn.qihangerp.api.pdd.controller.feign;
import cn.qihangerp.common.AjaxResult; 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 cn.qihangerp.module.open.pdd.service.PddRefundService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.open.pdd.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【oms_pdd_goods(pdd商品表)】的数据库操作Mapper * @description 针对表【oms_pdd_goods(pdd商品表)】的数据库操作Mapper
* @createDate 2025-05-20 12:31:44 * @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<PddGoods> { public interface PddGoodsMapper extends BaseMapper<PddGoods> {

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddGoodsSkuMapper.java
View File

@ -1,13 +1,13 @@
package cn.qihangerp.module.open.pdd.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**
* @author qilip * @author qilip
* @description 针对表【oms_pdd_goods_sku(pdd商品SKU表)】的数据库操作Mapper * @description 针对表【oms_pdd_goods_sku(pdd商品SKU表)】的数据库操作Mapper
* @createDate 2025-05-20 12:30:47 * @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<PddGoodsSku> { public interface PddGoodsSkuMapper extends BaseMapper<PddGoodsSku> {

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderItemMapper.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.open.pdd.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddOrderMapper.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.open.pdd.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/mapper/PddRefundMapper.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.open.pdd.mapper; 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; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/** /**

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsService.java
View File

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

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddGoodsSkuService.java
View File

@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; 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; import com.baomidou.mybatisplus.extension.service.IService;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderItemService.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.module.open.pdd.service; 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; import com.baomidou.mybatisplus.extension.service.IService;
/** /**

6
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddOrderService.java
View File

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

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/PddRefundService.java
View File

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

6
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java
View File

@ -12,9 +12,9 @@ import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper;
import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper;
import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo; import cn.qihangerp.model.bo.PddGoodsBo;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.service.PddGoodsService; import cn.qihangerp.module.open.pdd.service.PddGoodsService;

4
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java
View File

@ -8,8 +8,8 @@ import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.goods.service.OGoodsSkuService;
import cn.qihangerp.module.open.pdd.domain.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService; import cn.qihangerp.module.open.pdd.service.PddGoodsSkuService;

2
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderItemServiceImpl.java
View File

@ -1,6 +1,6 @@
package cn.qihangerp.module.open.pdd.service.impl; 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.mapper.PddOrderItemMapper;
import cn.qihangerp.module.open.pdd.service.PddOrderItemService; import cn.qihangerp.module.open.pdd.service.PddOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

15
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddOrderServiceImpl.java
View File

@ -6,18 +6,15 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.common.enums.EnumShopType; import cn.qihangerp.common.enums.EnumShopType;
import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.mapper.ErpOrderItemMapper; import cn.qihangerp.mapper.ErpOrderItemMapper;
import cn.qihangerp.mapper.ErpOrderMapper; 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.OOrder;
import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.model.entity.OOrderItem;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.domain.PddOrder; import cn.qihangerp.model.entity.PddOrder;
import cn.qihangerp.module.open.pdd.domain.PddOrderItem; import cn.qihangerp.model.entity.PddOrderItem;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderBo; import cn.qihangerp.model.bo.PddOrderBo;
import cn.qihangerp.module.open.pdd.domain.bo.PddOrderConfirmBo; import cn.qihangerp.model.bo.PddOrderConfirmBo;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper; import cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper;
import cn.qihangerp.module.open.pdd.mapper.PddOrderMapper; 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.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

6
serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddRefundServiceImpl.java
View File

@ -5,9 +5,9 @@ import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVo;
import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.module.open.pdd.domain.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.domain.PddRefund; import cn.qihangerp.model.entity.PddRefund;
import cn.qihangerp.module.open.pdd.domain.bo.PddRefundBo; import cn.qihangerp.model.bo.PddRefundBo;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper;
import cn.qihangerp.module.open.pdd.mapper.PddRefundMapper; import cn.qihangerp.module.open.pdd.mapper.PddRefundMapper;
import cn.qihangerp.module.open.pdd.service.PddRefundService; import cn.qihangerp.module.open.pdd.service.PddRefundService;

2
serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper"> <mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.open.pdd.domain.PddGoods"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddGoods">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/> <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="goodsName" column="goods_name" jdbcType="VARCHAR"/> <result property="goodsName" column="goods_name" jdbcType="VARCHAR"/>

2
serviceImpl/pdd/src/main/resources/mapper/pdd/PddGoodsSkuMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper"> <mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.open.pdd.domain.PddGoodsSku"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="skuId" column="sku_id" jdbcType="BIGINT"/> <result property="skuId" column="sku_id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/> <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>

2
serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderItemMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper"> <mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.open.pdd.domain.PddOrderItem"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/> <result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/> <result property="goodsId" column="goods_id" jdbcType="BIGINT"/>

2
serviceImpl/pdd/src/main/resources/mapper/pdd/PddOrderMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderMapper"> <mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.open.pdd.domain.PddOrder"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddOrder">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/> <result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/> <result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>

2
serviceImpl/pdd/src/main/resources/mapper/pdd/PddRefundMapper.xml
View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddRefundMapper"> <mapper namespace="cn.qihangerp.module.open.pdd.mapper.PddRefundMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.module.open.pdd.domain.PddRefund"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.PddRefund">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/> <result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/> <result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>