diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java index 9c0ed744..0f7ee697 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsBrandController.java @@ -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.*; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java index 4f00b009..2cd09e85 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsCategoryController.java @@ -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; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java index 8b267d4a..cabf7083 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsController.java @@ -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; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java index b7817234..33f3c5fd 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsInventoryController.java @@ -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; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java index 03f75a33..4a990cee 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/GoodsSupplierController.java @@ -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.*; diff --git a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java index eeec470b..e27d047f 100644 --- a/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java +++ b/api/erp-api/src/main/java/cn/qihangerp/erp/controller/ReportController.java @@ -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; diff --git a/api/oms-api/pom.xml b/api/oms-api/pom.xml index 27cf9d19..50591a6c 100644 --- a/api/oms-api/pom.xml +++ b/api/oms-api/pom.xml @@ -112,11 +112,11 @@ - - cn.qihangerp.service - dou - 2.0.0 - + + + + + org.codehaus.jackson jackson-mapper-asl diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java index 4f8b0bd6..d32fc999 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsApiController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java index 62ef67c9..2e78857c 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouGoodsController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java index e673febe..7d0911e0 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderApiController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java index 115a8c30..f9453097 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderContoller.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java index 18e6c934..d522a31f 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouOrderFeignController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java index 14730d4f..21cb59d1 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundApiController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java index 85592a9d..b6b1307c 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundController.java @@ -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.*; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java index a283f9ed..7796c08a 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouRefundFeignController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java index 64a4f4c8..dd37a0f9 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/dou/controller/DouWaybillController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java index 6667d7e2..2496b885 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/jd/controller/JdGoodsController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java index 47cbfa8c..1911df8f 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/pdd/controller/PddGoodsController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java index cedbc9b6..a140ddec 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/tao/controller/TaoGoodsController.java @@ -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; diff --git a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java index 804ad88d..48761e77 100644 --- a/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java +++ b/api/oms-api/src/main/java/cn/qihangerp/oms/wei/controller/WeiGoodsController.java @@ -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; diff --git a/docs/qihang-erp.sql b/docs/qihang-erp.sql index 47ab68a0..db9c8ab5 100644 --- a/docs/qihang-erp.sql +++ b/docs/qihang-erp.sql @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouGoodsMapper.java similarity index 88% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouGoodsMapper.java index 79242ba7..0df4e1f4 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouGoodsMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.DouGoods; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouGoodsSkuMapper.java similarity index 95% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouGoodsSkuMapper.java index 59d81bfa..97985182 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouGoodsSkuMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouGoodsSkuMapper.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouOOrderItemMapper.java similarity index 67% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouOOrderItemMapper.java index 7383bd9c..b4cdea55 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderItemMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouOOrderItemMapper.java @@ -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 diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouOOrderMapper.java similarity index 83% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouOOrderMapper.java index 16477a6c..293adf9d 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOOrderMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouOOrderMapper.java @@ -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 diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouOrderItemMapper.java similarity index 89% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouOrderItemMapper.java index 03af6cf8..cb2d49e4 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderItemMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouOrderItemMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.DouOrderItem; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouOrderMapper.java similarity index 88% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouOrderMapper.java index a2c18dea..23b80107 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouOrderMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouOrderMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.DouOrder; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java b/mapper/src/main/java/cn/qihangerp/mapper/DouRefundMapper.java similarity index 88% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java rename to mapper/src/main/java/cn/qihangerp/mapper/DouRefundMapper.java index 59cc5c43..0a2e3b6f 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/mapper/DouRefundMapper.java +++ b/mapper/src/main/java/cn/qihangerp/mapper/DouRefundMapper.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.mapper; +package cn.qihangerp.mapper; import cn.qihangerp.model.entity.DouRefund; diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml b/mapper/src/main/resources/mapper/DouGoodsMapper.xml similarity index 96% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml rename to mapper/src/main/resources/mapper/DouGoodsMapper.xml index 8ee1b9e3..e0e2322b 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsMapper.xml +++ b/mapper/src/main/resources/mapper/DouGoodsMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml b/mapper/src/main/resources/mapper/DouGoodsSkuMapper.xml similarity index 98% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml rename to mapper/src/main/resources/mapper/DouGoodsSkuMapper.xml index a84399ca..26feddf5 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouGoodsSkuMapper.xml +++ b/mapper/src/main/resources/mapper/DouGoodsSkuMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml b/mapper/src/main/resources/mapper/DouOOrderItemMapper.xml similarity index 97% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml rename to mapper/src/main/resources/mapper/DouOOrderItemMapper.xml index f2c08363..85081eb2 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/DouOOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml b/mapper/src/main/resources/mapper/DouOOrderMapper.xml similarity index 97% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml rename to mapper/src/main/resources/mapper/DouOOrderMapper.xml index a337aa50..87092780 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOOrderMapper.xml +++ b/mapper/src/main/resources/mapper/DouOOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml b/mapper/src/main/resources/mapper/DouOrderItemMapper.xml similarity index 98% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml rename to mapper/src/main/resources/mapper/DouOrderItemMapper.xml index f7776285..51ffdd1c 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderItemMapper.xml +++ b/mapper/src/main/resources/mapper/DouOrderItemMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml b/mapper/src/main/resources/mapper/DouOrderMapper.xml similarity index 99% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml rename to mapper/src/main/resources/mapper/DouOrderMapper.xml index d82a91ab..2365ffc0 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouOrderMapper.xml +++ b/mapper/src/main/resources/mapper/DouOrderMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml b/mapper/src/main/resources/mapper/DouRefundMapper.xml similarity index 98% rename from serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml rename to mapper/src/main/resources/mapper/DouRefundMapper.xml index fb8623e5..c5183d11 100644 --- a/serviceImpl/dou/src/main/resources/mapper/dou/DouRefundMapper.xml +++ b/mapper/src/main/resources/mapper/DouRefundMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java b/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java index 3f47d871..07333f55 100644 --- a/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java +++ b/model/src/main/java/cn/qihangerp/model/entity/JdOrderItem.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/DouGoodsService.java similarity index 93% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/DouGoodsService.java index 8ad54b83..18f818a0 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouGoodsService.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java similarity index 93% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java index b5c067f3..a14d532d 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouGoodsSkuService.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java b/service/src/main/java/cn/qihangerp/module/service/DouOrderItemService.java similarity index 87% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java rename to service/src/main/java/cn/qihangerp/module/service/DouOrderItemService.java index 549e0cca..447b46ac 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderItemService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouOrderItemService.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.open.dou.service; +package cn.qihangerp.module.service; import cn.qihangerp.model.entity.DouOrderItem; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java b/service/src/main/java/cn/qihangerp/module/service/DouOrderService.java similarity index 95% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java rename to service/src/main/java/cn/qihangerp/module/service/DouOrderService.java index f729ea27..a6bfe6ad 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouOrderService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouOrderService.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java b/service/src/main/java/cn/qihangerp/module/service/DouRefundService.java similarity index 93% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java rename to service/src/main/java/cn/qihangerp/module/service/DouRefundService.java index cabb40ae..3a27e1d8 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/DouRefundService.java +++ b/service/src/main/java/cn/qihangerp/module/service/DouRefundService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsBrandService.java similarity index 91% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsBrandService.java index e14ffb2d..952e9d51 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsBrandService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeService.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeService.java index 2c61b36b..ae7fefd7 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeValueService.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeValueService.java index 20f6052f..811c0c31 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryAttributeValueService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryService.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryService.java index aa337e70..fbd5abab 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsCategoryService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryBatchService.java similarity index 91% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryBatchService.java index afe3a116..9d1d35ff 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryBatchService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryService.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryService.java index 05a73432..56afc814 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsInventoryService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsService.java similarity index 97% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsService.java index 7b6af0b3..4bffeb49 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsSkuAttrService.java similarity index 87% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsSkuAttrService.java index 3eead0a4..a7cf678e 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsSkuAttrService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsSkuService.java similarity index 90% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsSkuService.java index 4ac9c15f..7735f497 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsSkuService.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java b/service/src/main/java/cn/qihangerp/module/service/OGoodsSupplierService.java similarity index 91% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java rename to service/src/main/java/cn/qihangerp/module/service/OGoodsSupplierService.java index ddabb3dc..58e34a5a 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java +++ b/service/src/main/java/cn/qihangerp/module/service/OGoodsSupplierService.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java similarity index 98% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java index b8fec950..e796ef36 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsServiceImpl.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java similarity index 91% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java index 44f8c017..f0f6c476 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouGoodsSkuServiceImpl.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderItemServiceImpl.java similarity index 72% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/DouOrderItemServiceImpl.java index 630e77ec..c07f729c 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderItemServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderItemServiceImpl.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java similarity index 99% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java index 86b4163b..62a812dc 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouOrderServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouOrderServiceImpl.java @@ -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; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/DouRefundServiceImpl.java similarity index 96% rename from serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/DouRefundServiceImpl.java index cc037ba7..06077a91 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouRefundServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/DouRefundServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsBrandServiceImpl.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsBrandServiceImpl.java index 1c32dc80..f3ae16ff 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsBrandServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeServiceImpl.java similarity index 82% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeServiceImpl.java index a32e4395..95286aaf 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeValueServiceImpl.java similarity index 82% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeValueServiceImpl.java index 968aa449..5c625e11 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryAttributeValueServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryServiceImpl.java similarity index 95% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryServiceImpl.java index c6dbced2..9e537ec9 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsCategoryServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryBatchServiceImpl.java similarity index 89% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryBatchServiceImpl.java index 1e1f7415..b97f3030 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryBatchServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryServiceImpl.java similarity index 93% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryServiceImpl.java index ac226548..2eb08910 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsInventoryServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java similarity index 99% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java index c1bba058..cb8af5d3 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuAttrServiceImpl.java similarity index 81% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuAttrServiceImpl.java index 6a29e73c..fec00310 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuAttrServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuServiceImpl.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuServiceImpl.java index 4631409a..ff22f754 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSkuServiceImpl.java @@ -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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSupplierServiceImpl.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java rename to service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSupplierServiceImpl.java index c2bfb9da..110b2b35 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java +++ b/service/src/main/java/cn/qihangerp/module/service/impl/OGoodsSupplierServiceImpl.java @@ -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; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java index e7717501..512a34d9 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsSkuServiceImpl.java @@ -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; diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java index e78d33f1..cbed413b 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdOrderServiceImpl.java @@ -113,13 +113,13 @@ public class JdOrderServiceImpl extends ServiceImpl // 添加item for (var item : order.getItems()) { - List pddGoodsSku = goodsSkuMapper.selectList( - new LambdaQueryWrapper() - .eq(JdGoodsSku::getSkuId, item.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId()); - item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId()); - } +// List pddGoodsSku = goodsSkuMapper.selectList( +// new LambdaQueryWrapper() +// .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 mapper.insert(order); // 添加item for (var item : order.getItems()) { - List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().eq(JdGoodsSku::getSkuId, item.getSkuId())); - if (pddGoodsSku != null && !pddGoodsSku.isEmpty()) { - item.setErpGoodsId(pddGoodsSku.get(0).getErpGoodsId()); - item.setErpGoodsSkuId(pddGoodsSku.get(0).getErpGoodsId()); - } +// List pddGoodsSku = goodsSkuMapper.selectList(new LambdaQueryWrapper().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); diff --git a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml index f3956261..411a91c4 100644 --- a/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml +++ b/serviceImpl/jd/src/main/resources/mapper/jd/JdOrderItemMapper.xml @@ -18,8 +18,7 @@ - - + diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java index 018c0042..d2722561 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsSkuServiceImpl.java @@ -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; diff --git a/serviceImpl/pom.xml b/serviceImpl/pom.xml index 26cdce3b..b77458a0 100644 --- a/serviceImpl/pom.xml +++ b/serviceImpl/pom.xml @@ -16,13 +16,13 @@ http://maven.apache.org sys - goods + wei stock jd - dou + tao pdd diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java index 5cc8d0f3..6f30e37d 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockInServiceImpl.java @@ -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; diff --git a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java index b70b984a..4a473f0f 100644 --- a/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java +++ b/serviceImpl/stock/src/main/java/cn/qihangerp/module/stock/service/impl/ErpStockOutServiceImpl.java @@ -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; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java index 30177e2f..7ebda5ab 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsSkuServiceImpl.java @@ -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; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java index 844c86f3..46f502a5 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsSkuServiceImpl.java @@ -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;