商品模块代码提交

cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java

@@ -3,10 +3,10 @@ package com.czg.controller;
 import cn.hutool.core.bean.BeanUtil;
 import com.czg.annotation.LogOperation;
 import com.czg.annotation.SaAdminCheckPermission;
+import com.czg.product.dto.ShopProdUnitDTO;
+import com.czg.product.entity.ShopProdUnit;
+import com.czg.product.service.ShopProdUnitService;
 import com.czg.resp.CzgResult;
-import com.czg.service.product.dto.ShopProdUnitDTO;
-import com.czg.service.product.entity.ShopProdUnit;
-import com.czg.service.product.service.ShopProdUnitService;
 import com.czg.utils.AssertUtil;
 import com.czg.validator.ValidatorUtil;
 import com.czg.validator.group.DefaultGroup;

cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.dto;
+package com.czg.product.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.dto;
+package com.czg.product.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;

cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.dto;
+package com.czg.product.dto;
 
 import com.alibaba.fastjson2.annotation.JSONField;
 import com.czg.validator.group.DefaultGroup;

cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.entity;
+package com.czg.product.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.entity;
+package com.czg.product.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;

cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.entity;
+package com.czg.product.entity;
 
 import com.mybatisflex.annotation.Id;
 import com.mybatisflex.annotation.KeyType;

cash-common/cash-common-service/src/main/java/com/czg/product/enums/UnitTypeEnum.java

@@ -1,4 +1,4 @@
-package com.czg.service.product.enums;
+package com.czg.product.enums;
 
 /**
  * 单位类型

cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java

@@ -0,0 +1,15 @@
+package com.czg.product.service;
+
+
+import com.czg.core.service.IBaseService;
+import com.czg.product.entity.Product;
+
+/**
+ * 商品
+ *
+ * @author Tankaikai tankaikai@aliyun.com
+ * @since 1.0 2025-02-10
+ */
+public interface ProductService extends IBaseService<Product> {
+
+}

cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java

@@ -0,0 +1,14 @@
+package com.czg.product.service;
+
+import com.czg.core.service.IBaseService;
+import com.czg.product.entity.ShopProdCategory;
+
+/**
+ * 店铺商品分类
+ *
+ * @author Tankaikai tankaikai@aliyun.com
+ * @since 1.0 2025-02-10
+ */
+public interface ShopProdCategoryService extends IBaseService<ShopProdCategory> {
+
+}

cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdUnitService.java

@@ -1,8 +1,8 @@
-package com.czg.service.product.service;
+package com.czg.product.service;
 
 import com.czg.core.service.IBaseService;
-import com.czg.service.product.dto.ShopProdUnitDTO;
+import com.czg.product.dto.ShopProdUnitDTO;
-import com.czg.service.product.entity.ShopProdUnit;
+import com.czg.product.entity.ShopProdUnit;
 import com.mybatisflex.core.paginate.Page;
 
 import java.util.List;

cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java

@@ -1,6 +1,6 @@
 package com.czg.service.product.mapper;
 
-import com.czg.service.product.entity.Product;
+import com.czg.product.entity.Product;
 import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdCategoryMapper.java

@@ -1,6 +1,6 @@
 package com.czg.service.product.mapper;
 
-import com.czg.service.product.entity.ShopProdCategory;
+import com.czg.product.entity.ShopProdCategory;
 import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdUnitMapper.java

@@ -1,6 +1,6 @@
 package com.czg.service.product.mapper;
 
-import com.czg.service.product.entity.ShopProdUnit;
+import com.czg.product.entity.ShopProdUnit;
 import com.mybatisflex.core.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 

cash-service/product-service/src/main/java/com/czg/service/product/service/ProductService.java

@@ -1,14 +0,0 @@
-package com.czg.service.product.service;
-
-import com.czg.service.product.entity.Product;
-import com.mybatisflex.core.service.IService;
-
-/**
- * 商品
- *
- * @author Tankaikai tankaikai@aliyun.com
- * @since 1.0 2025-02-10
- */
-public interface ProductService extends IService<Product> {
-
-}

cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdCategoryService.java

@@ -1,14 +0,0 @@
-package com.czg.service.product.service;
-
-import com.czg.service.product.entity.ShopProdCategory;
-import com.mybatisflex.core.service.IService;
-
-/**
- * 店铺商品分类
- *
- * @author Tankaikai tankaikai@aliyun.com
- * @since 1.0 2025-02-10
- */
-public interface ShopProdCategoryService extends IService<ShopProdCategory> {
-
-}

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java

@@ -1,9 +1,9 @@
 package com.czg.service.product.service.impl;
 
-import com.czg.service.product.entity.Product;
+import com.czg.core.service.impl.BaseServiceImpl;
+import com.czg.product.entity.Product;
+import com.czg.product.service.ProductService;
 import com.czg.service.product.mapper.ProductMapper;
-import com.czg.service.product.service.ProductService;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
  * @since 1.0 2025-02-10
  */
 @Service
-public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
+public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, Product> implements ProductService {
+
 
 }

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java

@@ -1,9 +1,9 @@
 package com.czg.service.product.service.impl;
 
-import com.czg.service.product.entity.ShopProdCategory;
+import com.czg.core.service.impl.BaseServiceImpl;
+import com.czg.product.entity.ShopProdCategory;
+import com.czg.product.service.ShopProdCategoryService;
 import com.czg.service.product.mapper.ShopProdCategoryMapper;
-import com.czg.service.product.service.ShopProdCategoryService;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Service;
  * @since 1.0 2025-02-10
  */
 @Service
-public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMapper, ShopProdCategory> implements ShopProdCategoryService {
+public class ShopProdCategoryServiceImpl extends BaseServiceImpl<ShopProdCategoryMapper, ShopProdCategory> implements ShopProdCategoryService {
 
 }

cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java

@@ -7,12 +7,12 @@ import com.czg.core.service.impl.BaseServiceImpl;
 import com.czg.enums.StatusEnum;
 import com.czg.enums.YesNoEnum;
 import com.czg.exception.CzgException;
+import com.czg.product.dto.ShopProdUnitDTO;
+import com.czg.product.entity.ShopProdUnit;
+import com.czg.product.enums.UnitTypeEnum;
+import com.czg.product.service.ShopProdUnitService;
 import com.czg.sa.StpKit;
-import com.czg.service.product.dto.ShopProdUnitDTO;
-import com.czg.service.product.entity.ShopProdUnit;
-import com.czg.service.product.enums.UnitTypeEnum;
 import com.czg.service.product.mapper.ShopProdUnitMapper;
-import com.czg.service.product.service.ShopProdUnitService;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryChain;
 import com.mybatisflex.core.query.QueryWrapper;
@@ -22,7 +22,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Map;
 
-import static com.czg.service.product.entity.table.ShopProdUnitTableDef.SHOP_PROD_UNIT;
+import static com.czg.product.entity.table.ShopProdUnitTableDef.SHOP_PROD_UNIT;
+
 
 /**
  * 商品单位Service实现类
@@ -33,7 +34,6 @@ import static com.czg.service.product.entity.table.ShopProdUnitTableDef.SHOP_PRO
 @Service
 public class ShopProdUnitServiceImpl extends BaseServiceImpl<ShopProdUnitMapper, ShopProdUnit> implements ShopProdUnitService {
 
-
     @Override
     public QueryWrapper query() {
         return super.query().from(SHOP_PROD_UNIT);