diff --git a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java b/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java index a7cf3225..156981e0 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/ShopProdUnitController.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ProductDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java similarity index 98% rename from cash-service/product-service/src/main/java/com/czg/service/product/dto/ProductDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/dto/ProductDTO.java index 33cb09f3..841166e1 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ProductDTO.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdCategoryDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java similarity index 96% rename from cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdCategoryDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdCategoryDTO.java index cd789774..9f02d72d 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdCategoryDTO.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java b/cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java similarity index 97% rename from cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/dto/ShopProdUnitDTO.java index d4ddde5a..6aa0ae61 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/dto/ShopProdUnitDTO.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java similarity index 98% rename from cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/entity/Product.java index d155314c..1e5cc332 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/Product.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java similarity index 96% rename from cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdCategory.java index 76393e7d..0c078040 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdCategory.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java b/cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java similarity index 95% rename from cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/entity/ShopProdUnit.java index 4c76a75b..5ca9fcd6 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/entity/ShopProdUnit.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/enums/UnitTypeEnum.java b/cash-common/cash-common-service/src/main/java/com/czg/product/enums/UnitTypeEnum.java similarity index 90% rename from cash-service/product-service/src/main/java/com/czg/service/product/enums/UnitTypeEnum.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/enums/UnitTypeEnum.java index d47e4896..23277133 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/enums/UnitTypeEnum.java +++ b/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; /** * 单位类型 diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ProductService.java new file mode 100644 index 00000000..f3b4cf73 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdCategoryService.java new file mode 100644 index 00000000..c06a2a1b --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdUnitService.java b/cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdUnitService.java similarity index 80% rename from cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdUnitService.java rename to cash-common/cash-common-service/src/main/java/com/czg/product/service/ShopProdUnitService.java index 2f942618..1c7560ab 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdUnitService.java +++ b/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.service.product.entity.ShopProdUnit; +import com.czg.product.dto.ShopProdUnitDTO; +import com.czg.product.entity.ShopProdUnit; import com.mybatisflex.core.paginate.Page; import java.util.List; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java index 33e669dd..d323b1a9 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ProductMapper.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdCategoryMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdCategoryMapper.java index bad0c53c..8783f731 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdCategoryMapper.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdUnitMapper.java b/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdUnitMapper.java index 50bf9eed..41dfa951 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/mapper/ShopProdUnitMapper.java +++ b/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; diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/ProductService.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/ProductService.java deleted file mode 100644 index 68abfd93..00000000 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/ProductService.java +++ /dev/null @@ -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 { - -} \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdCategoryService.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdCategoryService.java deleted file mode 100644 index 25a83d6f..00000000 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/ShopProdCategoryService.java +++ /dev/null @@ -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 { - -} \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java index f0355d25..a972915f 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ProductServiceImpl.java +++ b/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 implements ProductService { +public class ProductServiceImpl extends BaseServiceImpl implements ProductService { + } \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java index 449a856e..99802a1d 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdCategoryServiceImpl.java +++ b/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 implements ShopProdCategoryService { +public class ShopProdCategoryServiceImpl extends BaseServiceImpl implements ShopProdCategoryService { } \ No newline at end of file diff --git a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java b/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java index 668e65c2..d0c64b1a 100644 --- a/cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ShopProdUnitServiceImpl.java +++ b/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 implements ShopProdUnitService { - @Override public QueryWrapper query() { return super.query().from(SHOP_PROD_UNIT);