优化项目结构

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

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.TableField;

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.TableField;

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.TableField;

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.TableId;

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.TableId;

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;
@Data

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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<PddGoods> {

View File

@ -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<PddGoodsSku> {

View File

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

View File

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

View File

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

View File

@ -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;

View File

@ -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;

View File

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

View File

@ -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;

View File

@ -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;

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.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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>
<result property="goodsName" column="goods_name" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
<result property="skuId" column="sku_id" jdbcType="BIGINT"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>
<result property="goodsId" column="goods_id" jdbcType="BIGINT"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>

View File

@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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"/>
<result property="shopId" column="shop_id" jdbcType="INTEGER"/>
<result property="orderSn" column="order_sn" jdbcType="VARCHAR"/>