优化项目结构

This commit is contained in:
启航 2026-01-18 18:15:49 +08:00
parent 82827f0c82
commit 5a2655cdce
75 changed files with 125 additions and 142 deletions

View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.module.service.OGoodsBrandService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

View File

@ -7,9 +7,9 @@ import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; import cn.qihangerp.module.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; import cn.qihangerp.module.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.goods.service.OGoodsCategoryService; import cn.qihangerp.module.service.OGoodsCategoryService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -5,8 +5,8 @@ import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.model.bo.GoodsAddBo; import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.vo.GoodsSpecListVo; import cn.qihangerp.model.vo.GoodsSpecListVo;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;

View File

@ -7,8 +7,8 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.service.OGoodsInventoryService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo; import cn.qihangerp.common.TableDataInfo;
import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.module.service.OGoodsSupplierService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

View File

@ -2,7 +2,7 @@ package cn.qihangerp.erp.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.service.OGoodsInventoryService;
import cn.qihangerp.model.vo.SalesDailyVo; import cn.qihangerp.model.vo.SalesDailyVo;
import cn.qihangerp.model.vo.SalesTopSkuVo; import cn.qihangerp.model.vo.SalesTopSkuVo;
import cn.qihangerp.module.service.OOrderItemService; import cn.qihangerp.module.service.OOrderItemService;

View File

@ -112,11 +112,11 @@
<!-- <version>1.18.30</version>--> <!-- <version>1.18.30</version>-->
<!-- <scope>provided</scope>--> <!-- <scope>provided</scope>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>cn.qihangerp.service</groupId> <!-- <groupId>cn.qihangerp.service</groupId>-->
<artifactId>dou</artifactId> <!-- <artifactId>dou</artifactId>-->
<version>2.0.0</version> <!-- <version>2.0.0</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId> <artifactId>jackson-mapper-asl</artifactId>

View File

@ -7,7 +7,7 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.service.DouGoodsService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon; import cn.qihangerp.oms.dou.DouApiCommon;

View File

@ -3,12 +3,12 @@ package cn.qihangerp.oms.dou.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.service.OGoodsSkuService;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo; import cn.qihangerp.model.bo.DouGoodsBo;
import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.service.DouGoodsService;
import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; import cn.qihangerp.module.service.DouGoodsSkuService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

View File

@ -11,7 +11,7 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs; import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.entity.DouOrder;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;
import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.service.DouOrderService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon; import cn.qihangerp.oms.dou.DouApiCommon;

View File

@ -13,7 +13,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.entity.DouOrder;
import cn.qihangerp.model.bo.DouOrderBo; import cn.qihangerp.model.bo.DouOrderBo;
import cn.qihangerp.model.bo.DouOrderPushBo; import cn.qihangerp.model.bo.DouOrderPushBo;
import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.service.DouOrderService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.dou.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.entity.DouOrder;
import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.service.DouOrderService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -10,7 +10,7 @@ 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.model.entity.DouRefund; import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.DouRefundService;
import cn.qihangerp.module.service.OShopPullLasttimeService; import cn.qihangerp.module.service.OShopPullLasttimeService;
import cn.qihangerp.module.service.OShopPullLogsService; import cn.qihangerp.module.service.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon; import cn.qihangerp.oms.dou.DouApiCommon;

View File

@ -12,7 +12,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.DouRefund; import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.model.bo.DouOrderPushBo; import cn.qihangerp.model.bo.DouOrderPushBo;
import cn.qihangerp.model.bo.DouRefundBo; import cn.qihangerp.model.bo.DouRefundBo;
import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.DouRefundService;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

View File

@ -2,7 +2,7 @@ package cn.qihangerp.oms.dou.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.model.entity.DouRefund; import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.DouRefundService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -1,7 +1,7 @@
package cn.qihangerp.oms.dou.controller; package cn.qihangerp.oms.dou.controller;
import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.module.open.dou.service.DouOrderService; import cn.qihangerp.module.service.DouOrderService;
import cn.qihangerp.oms.dou.DouApiCommon; import cn.qihangerp.oms.dou.DouApiCommon;
import cn.qihangerp.open.dou.DouRequest; import cn.qihangerp.open.dou.DouRequest;
import cn.qihangerp.security.common.BaseController; import cn.qihangerp.security.common.BaseController;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.jd.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.service.OGoodsSkuService;
import cn.qihangerp.model.entity.JdGoods; import cn.qihangerp.model.entity.JdGoods;
import cn.qihangerp.model.entity.JdGoodsSku; import cn.qihangerp.model.entity.JdGoodsSku;
import cn.qihangerp.model.bo.JdGoodsBo; import cn.qihangerp.model.bo.JdGoodsBo;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.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.service.OGoodsSkuService;
import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.model.bo.PddGoodsBo; import cn.qihangerp.model.bo.PddGoodsBo;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.tao.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.service.OGoodsSkuService;
import cn.qihangerp.model.entity.TaoGoods; import cn.qihangerp.model.entity.TaoGoods;
import cn.qihangerp.model.entity.TaoGoodsSku; import cn.qihangerp.model.entity.TaoGoodsSku;
import cn.qihangerp.model.bo.TaoGoodsBo; import cn.qihangerp.model.bo.TaoGoodsBo;

View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.wei.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.service.OGoodsSkuService;
import cn.qihangerp.model.entity.WeiGoods; import cn.qihangerp.model.entity.WeiGoods;
import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.model.entity.WeiGoodsSku;
import cn.qihangerp.module.open.wei.service.WeiGoodsService; import cn.qihangerp.module.open.wei.service.WeiGoodsService;

View File

@ -2560,8 +2560,6 @@ CREATE TABLE `oms_jd_order_item` (
`product_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `product_no` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`service_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `service_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`new_store_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `new_store_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`erp_goods_id` bigint NULL DEFAULT NULL COMMENT '商品id(o_goods外键)',
`erp_goods_sku_id` bigint NULL DEFAULT NULL COMMENT '商品skuid(o_goods_sku外键)',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1794 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '京东订单明细表' ROW_FORMAT = DYNAMIC; ) ENGINE = InnoDB AUTO_INCREMENT = 1794 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '京东订单明细表' ROW_FORMAT = DYNAMIC;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.vo.DouGoodsSkuListVo; import cn.qihangerp.model.vo.DouGoodsSkuListVo;

View File

@ -1,11 +1,7 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OOrderItem; import cn.qihangerp.model.entity.OOrderItem;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* @author qilip * @author qilip

View File

@ -1,10 +1,8 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OOrder; import cn.qihangerp.model.entity.OOrder;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import java.util.List;
/** /**
* @author qilip * @author qilip
* @description 针对表o_order(OMS订单表)的数据库操作Mapper * @description 针对表o_order(OMS订单表)的数据库操作Mapper

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.DouOrder; import cn.qihangerp.model.entity.DouOrder;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.mapper; package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.DouRefund; import cn.qihangerp.model.entity.DouRefund;

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouGoodsMapper"> <mapper namespace="cn.qihangerp.mapper.DouGoodsMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoods"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoods">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper"> <mapper namespace="cn.qihangerp.mapper.DouGoodsSkuMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoodsSku"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouGoodsSku">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOOrderItemMapper"> <mapper namespace="cn.qihangerp.mapper.DouOOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderItem"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOOrderMapper"> <mapper namespace="cn.qihangerp.mapper.DouOOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrder"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.OOrder">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper"> <mapper namespace="cn.qihangerp.mapper.DouOrderItemMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrderItem"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrderItem">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouOrderMapper"> <mapper namespace="cn.qihangerp.mapper.DouOrderMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrder"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouOrder">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.qihangerp.module.open.dou.mapper.DouRefundMapper"> <mapper namespace="cn.qihangerp.mapper.DouRefundMapper">
<resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouRefund"> <resultMap id="BaseResultMap" type="cn.qihangerp.model.entity.DouRefund">
<id property="id" column="id" jdbcType="BIGINT"/> <id property="id" column="id" jdbcType="BIGINT"/>

View File

@ -80,15 +80,7 @@ public class JdOrderItem implements Serializable {
*/ */
private String newStoreId; private String newStoreId;
/**
* 商品id(o_goods外键)
*/
private Long erpGoodsId;
/**
* 商品skuid(o_goods_sku外键)
*/
private Long erpGoodsSkuId;
@TableField(exist = false) @TableField(exist = false)
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service; package cn.qihangerp.module.service;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
@ -14,9 +14,9 @@ import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo; import cn.qihangerp.model.bo.DouGoodsBo;
import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper; import cn.qihangerp.mapper.DouGoodsMapper;
import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; import cn.qihangerp.mapper.DouGoodsSkuMapper;
import cn.qihangerp.module.open.dou.service.DouGoodsService; import cn.qihangerp.module.service.DouGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
@ -6,14 +6,14 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.model.entity.OGoods; 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.OGoodsSkuService;
import cn.qihangerp.model.entity.DouGoods; import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku; import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo; import cn.qihangerp.model.bo.DouGoodsBo;
import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper; import cn.qihangerp.mapper.DouGoodsMapper;
import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper; import cn.qihangerp.mapper.DouGoodsSkuMapper;
import cn.qihangerp.module.open.dou.service.DouGoodsSkuService; import cn.qihangerp.module.service.DouGoodsSkuService;
import cn.qihangerp.module.service.OGoodsService;
import cn.qihangerp.module.service.OGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.open.dou.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;
import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper; import cn.qihangerp.mapper.DouOrderItemMapper;
import cn.qihangerp.module.open.dou.service.DouOrderItemService; import cn.qihangerp.module.service.DouOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
@ -6,11 +6,11 @@ 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.common.utils.DateUtils;
import cn.qihangerp.mapper.*;
import cn.qihangerp.model.entity.*; import cn.qihangerp.model.entity.*;
import cn.qihangerp.model.bo.DouOrderBo; import cn.qihangerp.model.bo.DouOrderBo;
import cn.qihangerp.model.bo.DouOrderConfirmBo; import cn.qihangerp.model.bo.DouOrderConfirmBo;
import cn.qihangerp.module.open.dou.mapper.*; import cn.qihangerp.module.service.DouOrderService;
import cn.qihangerp.module.open.dou.service.DouOrderService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.open.dou.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
@ -8,9 +8,9 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.model.entity.DouOrderItem; import cn.qihangerp.model.entity.DouOrderItem;
import cn.qihangerp.model.entity.DouRefund; import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.model.bo.DouRefundBo; import cn.qihangerp.model.bo.DouRefundBo;
import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper; import cn.qihangerp.mapper.DouOrderItemMapper;
import cn.qihangerp.module.open.dou.mapper.DouRefundMapper; import cn.qihangerp.mapper.DouRefundMapper;
import cn.qihangerp.module.open.dou.service.DouRefundService; import cn.qihangerp.module.service.DouRefundService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.entity.OGoodsBrand; import cn.qihangerp.model.entity.OGoodsBrand;
import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.module.service.OGoodsBrandService;
import cn.qihangerp.mapper.OGoodsBrandMapper; import cn.qihangerp.mapper.OGoodsBrandMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; import cn.qihangerp.module.service.OGoodsCategoryAttributeService;
import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper; import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; import cn.qihangerp.module.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper; import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
@ -6,7 +6,7 @@ import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper; import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsCategory; import cn.qihangerp.model.entity.OGoodsCategory;
import cn.qihangerp.module.goods.service.OGoodsCategoryService; import cn.qihangerp.module.service.OGoodsCategoryService;
import cn.qihangerp.mapper.OGoodsCategoryMapper; import cn.qihangerp.mapper.OGoodsCategoryMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,9 +1,9 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryBatchService;
import cn.qihangerp.mapper.OGoodsInventoryBatchMapper; import cn.qihangerp.mapper.OGoodsInventoryBatchMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.service.OGoodsInventoryService;
import cn.qihangerp.mapper.OGoodsInventoryMapper; import cn.qihangerp.mapper.OGoodsInventoryMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
@ -21,7 +21,7 @@ import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.model.bo.GoodsAddBo; import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.bo.GoodsAddSkuBo; import cn.qihangerp.model.bo.GoodsAddSkuBo;
import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.service.OGoodsService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.model.entity.OGoodsSkuAttr; import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.service.OGoodsSkuAttrService; import cn.qihangerp.module.service.OGoodsSkuAttrService;
import cn.qihangerp.mapper.OGoodsSkuAttrMapper; import cn.qihangerp.mapper.OGoodsSkuAttrMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,8 +1,8 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.mapper.OGoodsSkuMapper; import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,4 +1,4 @@
package cn.qihangerp.module.goods.service.impl; package cn.qihangerp.module.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.PageResult; import cn.qihangerp.common.PageResult;
import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.model.entity.OGoodsSupplier;
import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.module.service.OGoodsSupplierService;
import cn.qihangerp.mapper.OGoodsSupplierMapper; import cn.qihangerp.mapper.OGoodsSupplierMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -4,8 +4,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.model.entity.OGoods; 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.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import cn.qihangerp.model.entity.JdGoods; import cn.qihangerp.model.entity.JdGoods;
import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper; import cn.qihangerp.module.open.jd.mapper.JdGoodsMapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

View File

@ -113,13 +113,13 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
// 添加item // 添加item
for (var item : order.getItems()) { for (var item : order.getItems()) {
List<JdGoodsSku> pddGoodsSku = goodsSkuMapper.selectList( // List<JdGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(
new LambdaQueryWrapper<JdGoodsSku>() // new LambdaQueryWrapper<JdGoodsSku>()
.eq(JdGoodsSku::getSkuId, item.getSkuId())); // .eq(JdGoodsSku::getSkuId, item.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { // if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId()); // item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId());
item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId()); // item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
} // }
item.setJdOrderId(Long.parseLong(jdOrders.get(0).getId())); item.setJdOrderId(Long.parseLong(jdOrders.get(0).getId()));
item.setOrderId(jdOrders.get(0).getOrderId()); item.setOrderId(jdOrders.get(0).getOrderId());
itemMapper.insert(item); itemMapper.insert(item);
@ -159,11 +159,11 @@ public class JdOrderServiceImpl extends ServiceImpl<JdOrderMapper, JdOrder>
mapper.insert(order); mapper.insert(order);
// 添加item // 添加item
for (var item : order.getItems()) { for (var item : order.getItems()) {
List<JdGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<JdGoodsSku>().eq(JdGoodsSku::getSkuId, item.getSkuId())); // List<JdGoodsSku> pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper<JdGoodsSku>().eq(JdGoodsSku::getSkuId, item.getSkuId()));
if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { // if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) {
item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId()); // item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId());
item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId()); // item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId());
} // }
item.setJdOrderId(Long.parseLong(order.getId())); item.setJdOrderId(Long.parseLong(order.getId()));
item.setOrderId(order.getOrderId()); item.setOrderId(order.getOrderId());
itemMapper.insert(item); itemMapper.insert(item);

View File

@ -18,8 +18,7 @@
<result property="productNo" column="product_no" jdbcType="VARCHAR"/> <result property="productNo" column="product_no" jdbcType="VARCHAR"/>
<result property="serviceName" column="service_name" jdbcType="VARCHAR"/> <result property="serviceName" column="service_name" jdbcType="VARCHAR"/>
<result property="newStoreId" column="new_store_id" jdbcType="VARCHAR"/> <result property="newStoreId" column="new_store_id" jdbcType="VARCHAR"/>
<result property="erpGoodsId" column="erp_goods_id" jdbcType="BIGINT"/>
<result property="erpGoodsSkuId" column="erp_goods_sku_id" jdbcType="BIGINT"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">

View File

@ -6,8 +6,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.model.entity.OGoods; 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.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import cn.qihangerp.model.entity.PddGoods; import cn.qihangerp.model.entity.PddGoods;
import cn.qihangerp.model.entity.PddGoodsSku; import cn.qihangerp.model.entity.PddGoodsSku;
import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper;

View File

@ -16,13 +16,13 @@
<url>http://maven.apache.org</url> <url>http://maven.apache.org</url>
<modules> <modules>
<module>sys</module> <module>sys</module>
<module>goods</module> <!-- <module>goods</module>-->
<!-- <module>order</module>--> <!-- <module>order</module>-->
<!-- <module>service</module>--> <!-- <module>service</module>-->
<module>wei</module> <module>wei</module>
<module>stock</module> <module>stock</module>
<module>jd</module> <module>jd</module>
<module>dou</module> <!-- <module>dou</module>-->
<module>tao</module> <module>tao</module>
<module>pdd</module> <module>pdd</module>
<!-- <module>erp</module>--> <!-- <module>erp</module>-->

View File

@ -8,8 +8,8 @@ import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.service.OGoodsInventoryService;
import cn.qihangerp.model.entity.ErpStockIn; import cn.qihangerp.model.entity.ErpStockIn;
import cn.qihangerp.model.entity.ErpStockInItem; import cn.qihangerp.model.entity.ErpStockInItem;
import cn.qihangerp.module.stock.mapper.ErpStockInMapper; import cn.qihangerp.module.stock.mapper.ErpStockInMapper;

View File

@ -8,8 +8,8 @@ import cn.qihangerp.common.utils.DateUtils;
import cn.qihangerp.mapper.ErpStockOutMapper; import cn.qihangerp.mapper.ErpStockOutMapper;
import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.model.entity.OGoodsInventory;
import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.model.entity.OGoodsInventoryBatch;
import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.service.OGoodsInventoryBatchService;
import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.service.OGoodsInventoryService;
import cn.qihangerp.model.entity.ErpStockOut; import cn.qihangerp.model.entity.ErpStockOut;
import cn.qihangerp.model.entity.ErpStockOutItem; import cn.qihangerp.model.entity.ErpStockOutItem;
import cn.qihangerp.model.entity.ErpStockOutItemPosition; import cn.qihangerp.model.entity.ErpStockOutItemPosition;

View File

@ -5,7 +5,7 @@ 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.model.entity.OGoodsSku; import cn.qihangerp.model.entity.OGoodsSku;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import cn.qihangerp.model.entity.TaoGoods; import cn.qihangerp.model.entity.TaoGoods;
import cn.qihangerp.model.entity.TaoGoodsSku; import cn.qihangerp.model.entity.TaoGoodsSku;
import cn.qihangerp.model.bo.TaoGoodsBo; import cn.qihangerp.model.bo.TaoGoodsBo;

View File

@ -6,8 +6,8 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
import cn.qihangerp.model.entity.OGoods; 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.service.OGoodsService;
import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.service.OGoodsSkuService;
import cn.qihangerp.model.entity.WeiGoods; import cn.qihangerp.model.entity.WeiGoods;
import cn.qihangerp.model.entity.WeiGoodsSku; import cn.qihangerp.model.entity.WeiGoodsSku;
import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper; import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper;