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

优化项目结构

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

6
api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java
View File

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

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java
View File

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

4
api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java
View File

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

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.AjaxResult;
import cn.qihangerp.common.PageQuery;
import cn.qihangerp.common.TableDataInfo;
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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java
View File

@ -2,7 +2,7 @@ package cn.qihangerp.erp.controller;
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.SalesTopSkuVo;
import cn.qihangerp.module.service.OOrderItemService;

10
api/oms-api/pom.xml
View File

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

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java
View File

@ -7,7 +7,7 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.model.entity.DouGoods;
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.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon;

6
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java
View File

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

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java
View File

@ -11,7 +11,7 @@ import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs;
import cn.qihangerp.model.entity.DouOrder;
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.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon;

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java
View File

@ -13,7 +13,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.DouOrder;
import cn.qihangerp.model.bo.DouOrderBo;
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 com.alibaba.fastjson2.JSONObject;
import lombok.AllArgsConstructor;

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java
View File

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

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java
View File

@ -10,7 +10,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.OShopPullLasttime;
import cn.qihangerp.model.entity.OShopPullLogs;
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.OShopPullLogsService;
import cn.qihangerp.oms.dou.DouApiCommon;

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java
View File

@ -12,7 +12,7 @@ import cn.qihangerp.common.mq.MqUtils;
import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.model.bo.DouOrderPushBo;
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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java
View File

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

2
api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java
View File

@ -1,7 +1,7 @@
package cn.qihangerp.oms.dou.controller;
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.open.dou.DouRequest;
import cn.qihangerp.security.common.BaseController;

2
api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.jd.controller;
import cn.qihangerp.common.*;
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.JdGoodsSku;
import cn.qihangerp.model.bo.JdGoodsBo;

2
api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.pdd.controller;
import cn.qihangerp.common.*;
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.PddGoodsSku;
import cn.qihangerp.model.bo.PddGoodsBo;

2
api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.tao.controller;
import cn.qihangerp.common.*;
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.TaoGoodsSku;
import cn.qihangerp.model.bo.TaoGoodsBo;

2
api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java
View File

@ -3,7 +3,7 @@ package cn.qihangerp.oms.wei.controller;
import cn.qihangerp.common.*;
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.WeiGoodsSku;
import cn.qihangerp.module.open.wei.service.WeiGoodsService;

2
docs/qihang-erp.sql
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,
`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,
`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
) ENGINE = InnoDB AUTO_INCREMENT = 1794 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '京东订单明细表' ROW_FORMAT = DYNAMIC;

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouGoodsMapper.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouGoodsSkuMapper.java
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.vo.DouGoodsSkuListVo;

6
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouOOrderItemMapper.java
View File

@ -1,11 +1,7 @@
package cn.qihangerp.module.open.dou.mapper;
package cn.qihangerp.mapper;
import cn.qihangerp.model.entity.OOrderItem;
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

4
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouOOrderMapper.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouOrderItemMapper.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouOrderMapper.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java → mapper/src/main/java/cn/qihangerp/mapper/DouRefundMapper.java
View File

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

2
serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml → mapper/src/main/resources/mapper/DouGoodsMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml → mapper/src/main/resources/mapper/DouGoodsSkuMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml → mapper/src/main/resources/mapper/DouOOrderItemMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml → mapper/src/main/resources/mapper/DouOOrderMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml → mapper/src/main/resources/mapper/DouOrderItemMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml → mapper/src/main/resources/mapper/DouOrderMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

2
serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml → mapper/src/main/resources/mapper/DouRefundMapper.xml
View File

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"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">
<id property="id" column="id" jdbcType="BIGINT"/>

8
model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java → service/src/main/java/cn/qihangerp/module/service/DouGoodsService.java
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.PageResult;

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java → service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java
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.PageResult;

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java → service/src/main/java/cn/qihangerp/module/service/DouOrderItemService.java
View File

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

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java → service/src/main/java/cn/qihangerp/module/service/DouOrderService.java
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.PageResult;

2
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java → service/src/main/java/cn/qihangerp/module/service/DouRefundService.java
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.PageResult;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsBrandService.java
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.PageResult;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeValueService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryBatchService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryService.java
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.PageResult;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsService.java
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.PageResult;

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsSkuAttrService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsSkuService.java
View File

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

2
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java → service/src/main/java/cn/qihangerp/module/service/OGoodsSupplierService.java
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.PageResult;

8
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java
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.PageResult;
@ -14,9 +14,9 @@ import cn.qihangerp.mapper.OGoodsSkuMapper;
import cn.qihangerp.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo;
import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper;
import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
import cn.qihangerp.module.open.dou.service.DouGoodsService;
import cn.qihangerp.mapper.DouGoodsMapper;
import cn.qihangerp.mapper.DouGoodsSkuMapper;
import cn.qihangerp.module.service.DouGoodsService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

12
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java
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.PageResult;
@ -6,14 +6,14 @@ import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
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.model.entity.DouGoods;
import cn.qihangerp.model.entity.DouGoodsSku;
import cn.qihangerp.model.bo.DouGoodsBo;
import cn.qihangerp.module.open.dou.mapper.DouGoodsMapper;
import cn.qihangerp.module.open.dou.mapper.DouGoodsSkuMapper;
import cn.qihangerp.module.open.dou.service.DouGoodsSkuService;
import cn.qihangerp.mapper.DouGoodsMapper;
import cn.qihangerp.mapper.DouGoodsSkuMapper;
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.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

6
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/DouOrderItemServiceImpl.java
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.module.open.dou.mapper.DouOrderItemMapper;
import cn.qihangerp.module.open.dou.service.DouOrderItemService;
import cn.qihangerp.mapper.DouOrderItemMapper;
import cn.qihangerp.module.service.DouOrderItemService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

6
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java
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.PageResult;
@ -6,11 +6,11 @@ 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.*;
import cn.qihangerp.model.entity.*;
import cn.qihangerp.model.bo.DouOrderBo;
import cn.qihangerp.model.bo.DouOrderConfirmBo;
import cn.qihangerp.module.open.dou.mapper.*;
import cn.qihangerp.module.open.dou.service.DouOrderService;
import cn.qihangerp.module.service.DouOrderService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

8
serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/DouRefundServiceImpl.java
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;
@ -8,9 +8,9 @@ import cn.qihangerp.common.ResultVoEnum;
import cn.qihangerp.model.entity.DouOrderItem;
import cn.qihangerp.model.entity.DouRefund;
import cn.qihangerp.model.bo.DouRefundBo;
import cn.qihangerp.module.open.dou.mapper.DouOrderItemMapper;
import cn.qihangerp.module.open.dou.mapper.DouRefundMapper;
import cn.qihangerp.module.open.dou.service.DouRefundService;
import cn.qihangerp.mapper.DouOrderItemMapper;
import cn.qihangerp.mapper.DouRefundMapper;
import cn.qihangerp.module.service.DouRefundService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsBrandServiceImpl.java
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.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.PageResult;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeServiceImpl.java
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 cn.qihangerp.model.entity.OGoodsCategoryAttribute;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService;
import cn.qihangerp.module.service.OGoodsCategoryAttributeService;
import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeValueServiceImpl.java
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 cn.qihangerp.model.entity.OGoodsCategoryAttributeValue;
import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.module.service.OGoodsCategoryAttributeValueService;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryServiceImpl.java
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.OGoodsCategoryAttributeValue;
@ -6,7 +6,7 @@ import cn.qihangerp.mapper.OGoodsCategoryAttributeMapper;
import cn.qihangerp.mapper.OGoodsCategoryAttributeValueMapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryBatchServiceImpl.java
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.extension.service.impl.ServiceImpl;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryServiceImpl.java
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.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.service.impl.ServiceImpl;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java
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.OGoodsSku;
@ -21,7 +21,7 @@ import cn.qihangerp.model.entity.OGoods;
import cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.model.bo.GoodsAddBo;
import cn.qihangerp.model.bo.GoodsAddSkuBo;
import cn.qihangerp.module.goods.service.OGoodsService;
import cn.qihangerp.module.service.OGoodsService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuAttrServiceImpl.java
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 cn.qihangerp.model.entity.OGoodsSkuAttr;
import cn.qihangerp.module.goods.service.OGoodsSkuAttrService;
import cn.qihangerp.module.service.OGoodsSkuAttrService;
import cn.qihangerp.mapper.OGoodsSkuAttrMapper;
import org.springframework.stereotype.Service;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuServiceImpl.java
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.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.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;

4
serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java → service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSupplierServiceImpl.java
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.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.PageResult;
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 lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

4
serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java
View File

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

24
serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java
View File

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

3
serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml
View File

@ -18,8 +18,7 @@
<result property="productNo" column="product_no" jdbcType="VARCHAR"/>
<result property="serviceName" column="service_name" 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>
<sql id="Base_Column_List">

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

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

4
serviceImpl/pom.xml
View File

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

4
serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java
View File

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

4
serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java
View File

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

2
serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.qihangerp.common.PageResult;
import cn.qihangerp.common.ResultVo;
import cn.qihangerp.model.bo.LinkErpGoodsSkuBo;
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.TaoGoodsSku;
import cn.qihangerp.model.bo.TaoGoodsBo;

4
serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java
View File

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