From 888d04812daa68839ea8535f7eb3a7ba7b5d0e09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=AF=E8=88=AA=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Thu, 18 Sep 2025 13:26:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=96=B0=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/qihangerp/model}/bo/GoodsAddBo.java | 2 +- .../cn/qihangerp/model}/bo/GoodsAddSkuBo.java | 2 +- .../cn/qihangerp/model}/bo/GoodsSkuAddBo.java | 2 +- .../cn/qihangerp/model/entity}/OGoods.java | 2 +- .../qihangerp/model/entity}/OGoodsBrand.java | 2 +- .../model/entity}/OGoodsCategory.java | 2 +- .../model/entity}/OGoodsCategoryAttribute.java | 2 +- .../entity}/OGoodsCategoryAttributeValue.java | 2 +- .../model/entity}/OGoodsInventory.java | 2 +- .../model/entity}/OGoodsInventoryBatch.java | 2 +- .../cn/qihangerp/model/entity}/OGoodsSku.java | 2 +- .../qihangerp/model/entity}/OGoodsSkuAttr.java | 2 +- .../model/entity}/OGoodsSupplier.java | 2 +- .../qihangerp/model}/vo/GoodsSpecListVo.java | 2 +- .../goods/controller/GoodsBrandController.java | 2 +- .../controller/GoodsCategoryController.java | 6 +++--- .../api/goods/controller/GoodsController.java | 18 +++++------------- .../controller/GoodsInventoryController.java | 4 ++-- .../controller/GoodsSupplierController.java | 2 +- .../dou/service/impl/DouGoodsServiceImpl.java | 6 +++--- .../service/impl/DouGoodsSkuServiceImpl.java | 4 ++-- .../module/goods/mapper/OGoodsBrandMapper.java | 4 ++-- .../mapper/OGoodsCategoryAttributeMapper.java | 4 ++-- .../OGoodsCategoryAttributeValueMapper.java | 4 ++-- .../goods/mapper/OGoodsCategoryMapper.java | 4 ++-- .../mapper/OGoodsInventoryBatchMapper.java | 4 ++-- .../goods/mapper/OGoodsInventoryMapper.java | 4 ++-- .../module/goods/mapper/OGoodsMapper.java | 6 +++--- .../goods/mapper/OGoodsSkuAttrMapper.java | 4 ++-- .../module/goods/mapper/OGoodsSkuMapper.java | 4 ++-- .../goods/mapper/OGoodsSupplierMapper.java | 4 ++-- .../goods/service/OGoodsBrandService.java | 2 +- .../OGoodsCategoryAttributeService.java | 2 +- .../OGoodsCategoryAttributeValueService.java | 2 +- .../goods/service/OGoodsCategoryService.java | 2 +- .../service/OGoodsInventoryBatchService.java | 2 +- .../goods/service/OGoodsInventoryService.java | 2 +- .../module/goods/service/OGoodsService.java | 9 ++++----- .../goods/service/OGoodsSkuAttrService.java | 2 +- .../module/goods/service/OGoodsSkuService.java | 2 +- .../goods/service/OGoodsSupplierService.java | 2 +- .../service/impl/OGoodsBrandServiceImpl.java | 2 +- .../OGoodsCategoryAttributeServiceImpl.java | 2 +- ...GoodsCategoryAttributeValueServiceImpl.java | 2 +- .../impl/OGoodsCategoryServiceImpl.java | 6 +++--- .../impl/OGoodsInventoryBatchServiceImpl.java | 2 +- .../impl/OGoodsInventoryServiceImpl.java | 2 +- .../goods/service/impl/OGoodsServiceImpl.java | 15 +++++++-------- .../service/impl/OGoodsSkuAttrServiceImpl.java | 2 +- .../service/impl/OGoodsSkuServiceImpl.java | 2 +- .../impl/OGoodsSupplierServiceImpl.java | 2 +- .../resources/mapper/OGoodsBrandMapper.xml | 2 +- .../mapper/OGoodsCategoryAttributeMapper.xml | 2 +- .../OGoodsCategoryAttributeValueMapper.xml | 2 +- .../resources/mapper/OGoodsCategoryMapper.xml | 2 +- .../mapper/OGoodsInventoryBatchMapper.xml | 2 +- .../resources/mapper/OGoodsInventoryMapper.xml | 2 +- .../src/main/resources/mapper/OGoodsMapper.xml | 4 ++-- .../resources/mapper/OGoodsSkuAttrMapper.xml | 2 +- .../main/resources/mapper/OGoodsSkuMapper.xml | 2 +- .../resources/mapper/OGoodsSupplierMapper.xml | 2 +- .../jd/service/impl/JdGoodsServiceImpl.java | 9 +++------ .../jd/service/impl/JdGoodsSkuServiceImpl.java | 4 ++-- .../order/service/impl/OOrderServiceImpl.java | 6 +++--- .../order/service/impl/ORefundServiceImpl.java | 2 +- .../impl/OfflineGoodsSkuServiceImpl.java | 2 +- .../pdd/service/impl/PddGoodsServiceImpl.java | 8 +++----- .../service/impl/PddGoodsSkuServiceImpl.java | 4 ++-- .../service/impl/ErpStockInServiceImpl.java | 4 ++-- .../service/impl/ErpStockOutServiceImpl.java | 4 ++-- .../tao/service/impl/TaoGoodsServiceImpl.java | 8 +++----- .../service/impl/TaoGoodsSkuServiceImpl.java | 2 +- .../wei/service/impl/WeiGoodsServiceImpl.java | 7 +++---- .../service/impl/WeiGoodsSkuServiceImpl.java | 4 ++-- 74 files changed, 122 insertions(+), 140 deletions(-) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model}/bo/GoodsAddBo.java (98%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model}/bo/GoodsAddSkuBo.java (97%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model}/bo/GoodsSkuAddBo.java (92%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoods.java (98%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsBrand.java (94%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsCategory.java (96%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsCategoryAttribute.java (94%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsCategoryAttributeValue.java (94%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsInventory.java (97%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsInventoryBatch.java (97%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsSku.java (98%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsSkuAttr.java (94%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model/entity}/OGoodsSupplier.java (97%) rename {serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain => core/model/src/main/java/cn/qihangerp/model}/vo/GoodsSpecListVo.java (92%) diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddBo.java similarity index 98% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddBo.java index b20751b6..9f9e43d8 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddSkuBo.java similarity index 97% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddSkuBo.java index 7eb83ef3..95b21738 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsAddSkuBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsAddSkuBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain.bo; +package cn.qihangerp.model.bo; import java.math.BigDecimal; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsSkuAddBo.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java rename to core/model/src/main/java/cn/qihangerp/model/bo/GoodsSkuAddBo.java index 2977a755..62703e66 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/bo/GoodsSkuAddBo.java +++ b/core/model/src/main/java/cn/qihangerp/model/bo/GoodsSkuAddBo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain.bo; +package cn.qihangerp.model.bo; import lombok.Data; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoods.java similarity index 98% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoods.java index 634c97c0..3149b254 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoods.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoods.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsBrand.java similarity index 94% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsBrand.java index 41789f34..f2221a5a 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsBrand.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsBrand.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategory.java similarity index 96% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategory.java index ed1dfd88..d7ddc9f4 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategory.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategory.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttribute.java similarity index 94% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttribute.java index 4e2a3a9b..4aeace55 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttribute.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttribute.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttributeValue.java similarity index 94% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttributeValue.java index 28de36c2..e047af62 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsCategoryAttributeValue.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsCategoryAttributeValue.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventory.java similarity index 97% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventory.java index 75188572..78f55a06 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventory.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventory.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventoryBatch.java similarity index 97% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventoryBatch.java index 68456ee6..745e700e 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsInventoryBatch.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsInventoryBatch.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java similarity index 98% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java index 9fe977ff..9b26d906 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSku.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSku.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSkuAttr.java similarity index 94% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSkuAttr.java index a698348f..9ee97456 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSkuAttr.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSkuAttr.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSupplier.java similarity index 97% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java rename to core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSupplier.java index 185dad5e..a54963ba 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/OGoodsSupplier.java +++ b/core/model/src/main/java/cn/qihangerp/model/entity/OGoodsSupplier.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain; +package cn.qihangerp.model.entity; import java.io.Serializable; import java.util.Date; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java b/core/model/src/main/java/cn/qihangerp/model/vo/GoodsSpecListVo.java similarity index 92% rename from serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java rename to core/model/src/main/java/cn/qihangerp/model/vo/GoodsSpecListVo.java index 1750b04d..bcd1520c 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/domain/vo/GoodsSpecListVo.java +++ b/core/model/src/main/java/cn/qihangerp/model/vo/GoodsSpecListVo.java @@ -1,4 +1,4 @@ -package cn.qihangerp.module.goods.domain.vo; +package cn.qihangerp.model.vo; import lombok.Data; diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java index ac029854..af0e9331 100644 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java +++ b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsBrandController.java @@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.model.entity.OGoodsBrand; import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java index d8b56822..8e5fc300 100644 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java +++ b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsCategoryController.java @@ -4,9 +4,9 @@ package cn.qihangerp.api.goods.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.goods.domain.OGoodsCategory; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +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; diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java index 4a0ac326..0c208eb7 100644 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java +++ b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsController.java @@ -1,26 +1,18 @@ package cn.qihangerp.api.goods.controller; import cn.qihangerp.common.*; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; -import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; -import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +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.security.common.BaseController; -import com.fasterxml.jackson.databind.exc.InvalidFormatException; import lombok.AllArgsConstructor; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; + import java.util.List; -import java.util.Map; /** * 商品管理Controller diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java index 82ef903f..53a81614 100644 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java +++ b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsInventoryController.java @@ -5,8 +5,8 @@ import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +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.security.common.BaseController; diff --git a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java index 1ff5d86f..2b4ba101 100644 --- a/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java +++ b/microservices/goods-api/src/main/java/cn/qihangerp/api/goods/controller/GoodsSupplierController.java @@ -4,7 +4,7 @@ package cn.qihangerp.api.goods.controller; import cn.qihangerp.common.AjaxResult; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.TableDataInfo; -import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.security.common.BaseController; import lombok.AllArgsConstructor; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java index 8e79f4c2..7145927e 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsServiceImpl.java @@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; diff --git a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java index ef550547..44f8c017 100644 --- a/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java +++ b/serviceImpl/dou/src/main/java/cn/qihangerp/module/open/dou/service/impl/DouGoodsSkuServiceImpl.java @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; +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; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java index be679e5f..804eb597 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsBrandMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.model.entity.OGoodsBrand; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_brand】的数据库操作Mapper * @createDate 2024-09-07 16:11:56 -* @Entity cn.qihangerp.module.goods.domain.OGoodsBrand +* @Entity cn.qihangerp.model.entity.OGoodsBrand */ public interface OGoodsBrandMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java index a889c7e5..2e69292e 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_category_attribute】的数据库操作Mapper * @createDate 2024-09-07 16:11:56 -* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute +* @Entity cn.qihangerp.model.entity.OGoodsCategoryAttribute */ public interface OGoodsCategoryAttributeMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java index c7cc5dc3..8f1762f2 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryAttributeValueMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_category_attribute_value】的数据库操作Mapper * @createDate 2024-09-07 16:11:56 -* @Entity cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue +* @Entity cn.qihangerp.model.entity.OGoodsCategoryAttributeValue */ public interface OGoodsCategoryAttributeValueMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java index 0b75f71f..1c887346 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsCategoryMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsCategory; +import cn.qihangerp.model.entity.OGoodsCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_category】的数据库操作Mapper * @createDate 2024-09-07 16:11:56 -* @Entity cn.qihangerp.module.goods.domain.OGoodsCategory +* @Entity cn.qihangerp.model.entity.OGoodsCategory */ public interface OGoodsCategoryMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java index 470049aa..81cbc87b 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryBatchMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import cn.qihangerp.model.entity.OGoodsInventoryBatch; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_inventory_batch(商品库存批次)】的数据库操作Mapper * @createDate 2024-09-23 22:39:50 -* @Entity cn.qihangerp.module.goods.domain.OGoodsInventoryBatch +* @Entity cn.qihangerp.model.entity.OGoodsInventoryBatch */ public interface OGoodsInventoryBatchMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java index 28f48260..59acd4b2 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsInventoryMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsInventory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_inventory(商品库存表)】的数据库操作Mapper * @createDate 2025-05-19 12:04:26 -* @Entity cn.qihangerp.module.goods.domain.OGoodsInventory +* @Entity cn.qihangerp.model.entity.OGoodsInventory */ public interface OGoodsInventoryMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java index 8cf06f07..ff309f44 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsMapper.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.vo.GoodsSpecListVo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -11,7 +11,7 @@ import java.util.List; * @author TW * @description 针对表【o_goods(商品库存管理)】的数据库操作Mapper * @createDate 2024-03-11 14:24:49 -* @Entity cn.qihangerp.module.goods.domain.OGoods +* @Entity cn.qihangerp.model.entity.OGoods */ public interface OGoodsMapper extends BaseMapper { List searchGoodsSpec(String keyword); diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java index d9ccd658..eaa0feaa 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuAttrMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import cn.qihangerp.model.entity.OGoodsSkuAttr; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_sku_attr】的数据库操作Mapper * @createDate 2024-09-07 20:31:18 -* @Entity cn.qihangerp.module.goods.domain.OGoodsSkuAttr +* @Entity cn.qihangerp.model.entity.OGoodsSkuAttr */ public interface OGoodsSkuAttrMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java index 0b0798be..b917c8fc 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSkuMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_sku(OMS商品SKU表)】的数据库操作Mapper * @createDate 2025-05-19 12:00:55 -* @Entity cn.qihangerp.module.goods.domain.OGoodsSku +* @Entity cn.qihangerp.model.entity.OGoodsSku */ public interface OGoodsSkuMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java index 7714b139..f958badd 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/mapper/OGoodsSupplierMapper.java @@ -1,13 +1,13 @@ package cn.qihangerp.module.goods.mapper; -import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.model.entity.OGoodsSupplier; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @author qilip * @description 针对表【o_goods_supplier】的数据库操作Mapper * @createDate 2024-09-07 16:35:43 -* @Entity cn.qihangerp.module.goods.domain.OGoodsSupplier +* @Entity cn.qihangerp.model.entity.OGoodsSupplier */ public interface OGoodsSupplierMapper extends BaseMapper { diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java index bc06a93d..e14ffb2d 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsBrandService.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.model.entity.OGoodsBrand; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java index 2f4004c4..2c61b36b 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +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/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java index daa5c481..20f6052f 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryAttributeValueService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +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/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java index e75f6cf9..aa337e70 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsCategoryService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsCategory; +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/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java index b558267d..c81b041a 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryBatchService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +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/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java index e70d41f7..05a73432 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsInventoryService.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.goods.domain.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsInventory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java index 0cc539fc..7b6af0b3 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsService.java @@ -4,11 +4,10 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; -import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; -import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; -import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +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 com.baomidou.mybatisplus.extension.service.IService; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java index dea341f0..3eead0a4 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuAttrService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +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/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java index 473ec278..4ac9c15f 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSkuService.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java index 31ba6104..ddabb3dc 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/OGoodsSupplierService.java @@ -2,7 +2,7 @@ package cn.qihangerp.module.goods.service; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.model.entity.OGoodsSupplier; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java index f3e74b7e..6f59b43b 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsBrandServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.goods.domain.OGoodsBrand; +import cn.qihangerp.model.entity.OGoodsBrand; import cn.qihangerp.module.goods.service.OGoodsBrandService; import cn.qihangerp.module.goods.mapper.OGoodsBrandMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java index 7e7fe99d..f09aabb7 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.goods.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; +import cn.qihangerp.model.entity.OGoodsCategoryAttribute; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeService; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java index ecbbd332..068f4865 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryAttributeValueServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.goods.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.module.goods.service.OGoodsCategoryAttributeValueService; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java index 07f26290..c206e334 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsCategoryServiceImpl.java @@ -1,11 +1,11 @@ package cn.qihangerp.module.goods.service.impl; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttribute; -import cn.qihangerp.module.goods.domain.OGoodsCategoryAttributeValue; +import cn.qihangerp.model.entity.OGoodsCategoryAttribute; +import cn.qihangerp.model.entity.OGoodsCategoryAttributeValue; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeMapper; import cn.qihangerp.module.goods.mapper.OGoodsCategoryAttributeValueMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.goods.domain.OGoodsCategory; +import cn.qihangerp.model.entity.OGoodsCategory; import cn.qihangerp.module.goods.service.OGoodsCategoryService; import cn.qihangerp.module.goods.mapper.OGoodsCategoryMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java index 80bb3430..f2d672a0 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryBatchServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.goods.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +import cn.qihangerp.model.entity.OGoodsInventoryBatch; import cn.qihangerp.module.goods.service.OGoodsInventoryBatchService; import cn.qihangerp.module.goods.mapper.OGoodsInventoryBatchMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java index b1b82652..d307ae0d 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsInventoryServiceImpl.java @@ -5,7 +5,7 @@ import cn.qihangerp.common.PageResult; 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.module.goods.domain.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsInventory; import cn.qihangerp.module.goods.service.OGoodsInventoryService; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java index ad734820..5560b083 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsServiceImpl.java @@ -1,9 +1,8 @@ package cn.qihangerp.module.goods.service.impl; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; -import cn.qihangerp.module.goods.domain.bo.GoodsSkuAddBo; -import cn.qihangerp.module.goods.domain.vo.GoodsSpecListVo; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; +import cn.qihangerp.model.vo.GoodsSpecListVo; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; @@ -17,11 +16,11 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.goods.domain.OGoods; +import cn.qihangerp.model.entity.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; -import cn.qihangerp.module.goods.domain.bo.GoodsAddBo; -import cn.qihangerp.module.goods.domain.bo.GoodsAddSkuBo; +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 lombok.AllArgsConstructor; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java index b49385c5..eb13c8e8 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuAttrServiceImpl.java @@ -1,7 +1,7 @@ package cn.qihangerp.module.goods.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import cn.qihangerp.module.goods.domain.OGoodsSkuAttr; +import cn.qihangerp.model.entity.OGoodsSkuAttr; import cn.qihangerp.module.goods.service.OGoodsSkuAttrService; import cn.qihangerp.module.goods.mapper.OGoodsSkuAttrMapper; import org.springframework.stereotype.Service; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java index 98253000..c776f99f 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSkuServiceImpl.java @@ -1,6 +1,6 @@ package cn.qihangerp.module.goods.service.impl; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.service.OGoodsSkuService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java index eb3d018a..649df872 100644 --- a/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java +++ b/serviceImpl/goods/src/main/java/cn/qihangerp/module/goods/service/impl/OGoodsSupplierServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; -import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.module.goods.service.OGoodsSupplierService; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; import lombok.AllArgsConstructor; diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml index 48c4641e..2126c976 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsBrandMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml index d61dee39..064408a6 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml index 91ec933f..915dd8b1 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryAttributeValueMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml index 38146d7a..2c8276a6 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsCategoryMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml index d6cc3dd8..cb882a47 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryBatchMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml index 00529c2a..5de1ba78 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsInventoryMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml index cce1191e..6fd14c2b 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -46,7 +46,7 @@ - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml index e334049a..4e803c6a 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuAttrMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml index 86b747e3..131b6c68 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsSkuMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml b/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml index e915afab..3fca2200 100644 --- a/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml +++ b/serviceImpl/goods/src/main/resources/mapper/OGoodsSupplierMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java index bddb165c..a3f09c49 100644 --- a/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java +++ b/serviceImpl/jd/src/main/java/cn/qihangerp/module/open/jd/service/impl/JdGoodsServiceImpl.java @@ -2,9 +2,9 @@ package cn.qihangerp.module.open.jd.service.impl; import cn.qihangerp.common.ResultVoEnum; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; @@ -29,9 +29,6 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; import java.util.stream.Collectors; 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 19e42e95..e1a4712d 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 @@ -2,8 +2,8 @@ package cn.qihangerp.module.open.jd.service.impl; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.jd.domain.JdGoods; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java index 2f2351ef..4094fb33 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OOrderServiceImpl.java @@ -2,9 +2,9 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.model.entity.OLogisticsCompany; import cn.qihangerp.model.request.OrderSearchRequest; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; -import cn.qihangerp.module.goods.domain.OGoodsSupplier; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSupplier; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.goods.mapper.OGoodsSupplierMapper; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java index b502a60a..278069d7 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/ORefundServiceImpl.java @@ -7,7 +7,7 @@ package cn.qihangerp.module.order.service.impl; import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.order.domain.OAfterSale; import cn.qihangerp.module.order.domain.OOrder; diff --git a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java index 47b7f26a..ef94a4ae 100644 --- a/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java +++ b/serviceImpl/order/src/main/java/cn/qihangerp/module/order/service/impl/OfflineGoodsSkuServiceImpl.java @@ -3,7 +3,7 @@ package cn.qihangerp.module.order.service.impl; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; import cn.qihangerp.module.order.domain.OfflineGoodsSku; import cn.qihangerp.module.order.mapper.OfflineGoodsSkuMapper; diff --git a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java index 1279f67e..20ecc856 100644 --- a/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java +++ b/serviceImpl/pdd/src/main/java/cn/qihangerp/module/open/pdd/service/impl/PddGoodsServiceImpl.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; @@ -18,8 +18,6 @@ import cn.qihangerp.module.open.pdd.domain.bo.PddGoodsBo; import cn.qihangerp.module.open.pdd.mapper.PddGoodsMapper; import cn.qihangerp.module.open.pdd.mapper.PddGoodsSkuMapper; import cn.qihangerp.module.open.pdd.service.PddGoodsService; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; 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/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 64882748..835eb31e 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 @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.pdd.domain.PddGoods; 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 d602418c..996f8676 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 @@ -6,8 +6,8 @@ import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.DateUtils; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +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.stock.domain.ErpStockIn; 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 dac0bc0b..f0981423 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 @@ -5,8 +5,8 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.DateUtils; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsInventoryBatch; +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.stock.domain.ErpStockOut; diff --git a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java index 75f3e05a..c57b9199 100644 --- a/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java +++ b/serviceImpl/tao/src/main/java/cn/qihangerp/module/open/tao/service/impl/TaoGoodsServiceImpl.java @@ -6,9 +6,9 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; @@ -18,8 +18,6 @@ import cn.qihangerp.module.open.tao.domain.bo.TaoGoodsBo; import cn.qihangerp.module.open.tao.mapper.TaoGoodsMapper; import cn.qihangerp.module.open.tao.mapper.TaoGoodsSkuMapper; import cn.qihangerp.module.open.tao.service.TaoGoodsService; -import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; 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/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 91b1ed8b..6fe9e98b 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 @@ -4,7 +4,7 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.tao.domain.TaoGoods; import cn.qihangerp.module.open.tao.domain.TaoGoodsSku; diff --git a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java index 70902e62..0bb14b58 100644 --- a/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java +++ b/serviceImpl/wei/src/main/java/cn/qihangerp/module/open/wei/service/impl/WeiGoodsServiceImpl.java @@ -5,9 +5,9 @@ import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.common.ResultVoEnum; import cn.qihangerp.common.utils.StringUtils; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsInventory; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsInventory; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.mapper.OGoodsInventoryMapper; import cn.qihangerp.module.goods.mapper.OGoodsMapper; import cn.qihangerp.module.goods.mapper.OGoodsSkuMapper; @@ -17,7 +17,6 @@ import cn.qihangerp.module.open.wei.mapper.WeiGoodsMapper; import cn.qihangerp.module.open.wei.mapper.WeiGoodsSkuMapper; import cn.qihangerp.module.open.wei.service.WeiGoodsService; import com.alibaba.fastjson2.JSONArray; -import com.alibaba.fastjson2.JSONObject; 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/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 1352f683..323c784d 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 @@ -4,8 +4,8 @@ import cn.qihangerp.common.PageQuery; import cn.qihangerp.common.PageResult; import cn.qihangerp.common.ResultVo; import cn.qihangerp.model.bo.LinkErpGoodsSkuBo; -import cn.qihangerp.module.goods.domain.OGoods; -import cn.qihangerp.module.goods.domain.OGoodsSku; +import cn.qihangerp.model.entity.OGoods; +import cn.qihangerp.model.entity.OGoodsSku; import cn.qihangerp.module.goods.service.OGoodsService; import cn.qihangerp.module.goods.service.OGoodsSkuService; import cn.qihangerp.module.open.wei.domain.WeiGoods;