商品模块代码提交

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

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

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

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

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

@@ -1,9 +1,9 @@
 package com.czg.product.service;
 
-import com.czg.core.service.IBaseService;
 import com.czg.product.dto.ShopProdUnitDTO;
 import com.czg.product.entity.ShopProdUnit;
 import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.service.IService;
 
 import java.util.List;
 
@@ -13,7 +13,7 @@ import java.util.List;
  * @author Tankaikai tankaikai@aliyun.com
  * @since 1.0 2025-02-10
  */
-public interface ShopProdUnitService extends IBaseService<ShopProdUnit> {
+public interface ShopProdUnitService extends IService<ShopProdUnit> {
 
     Page<ShopProdUnitDTO> page(ShopProdUnitDTO param);
 

cash-common/cash-common-tools/src/main/java/com/czg/core/service/IBaseService.java

@@ -1,12 +0,0 @@
-package com.czg.core.service;
-
-import com.mybatisflex.core.service.IService;
-
-/**
- * 自定义的服务基类接口
- *
- * @author Cashier
- */
-public interface IBaseService<T> extends IService<T> {
-
-}

cash-common/cash-common-tools/src/main/java/com/czg/utils/PageUtil.java

@@ -1,27 +1,24 @@
-package com.czg.core.service.impl;
+package com.czg.utils;
 
 import cn.hutool.core.util.StrUtil;
 import com.czg.core.page.PageDomain;
 import com.czg.core.page.TableSupport;
-import com.czg.core.service.IBaseService;
-import com.czg.utils.SqlUtil;
-import com.mybatisflex.core.BaseMapper;
 import com.mybatisflex.core.query.QueryWrapper;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
+import lombok.experimental.UtilityClass;
 
 /**
- * 自定义的服务基类接口实现
- *
- * @author Cashier
+ * 分页工具类
+ * @author tankaikai
+ * @since 2025-02-11 16:56
  */
-public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M , T> implements IBaseService<T> {
-
+@UtilityClass
+public class PageUtil {
     /**
-     * 构造基本查询条件
+     * 构造分页排序条件
      * @return QueryWrapper
      */
-    protected QueryWrapper buildPageQueryWrapper(){
-        QueryWrapper queryWrapper = query();
+    public QueryWrapper buildPageQueryWrapper(){
+        QueryWrapper queryWrapper = QueryWrapper.create();
         PageDomain pageDomain = TableSupport.buildPageRequest();
         if (StrUtil.isNotEmpty(pageDomain.getOrderBy())) {
             String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());

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.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.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
  * @since 1.0 2025-02-10
  */
 @Service
-public class ProductServiceImpl extends BaseServiceImpl<ProductMapper, Product> implements ProductService {
+public class ProductServiceImpl extends ServiceImpl<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.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.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 BaseServiceImpl<ShopProdCategoryMapper, ShopProdCategory> implements ShopProdCategoryService {
+public class ShopProdCategoryServiceImpl extends ServiceImpl<ShopProdCategoryMapper, ShopProdCategory> implements ShopProdCategoryService {
 
 }

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

@@ -3,7 +3,6 @@ package com.czg.service.product.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.czg.core.page.PageQuery;
-import com.czg.core.service.impl.BaseServiceImpl;
 import com.czg.enums.StatusEnum;
 import com.czg.enums.YesNoEnum;
 import com.czg.exception.CzgException;
@@ -13,9 +12,11 @@ import com.czg.product.enums.UnitTypeEnum;
 import com.czg.product.service.ShopProdUnitService;
 import com.czg.sa.StpKit;
 import com.czg.service.product.mapper.ShopProdUnitMapper;
+import com.czg.utils.PageUtil;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.core.update.UpdateChain;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -28,10 +29,10 @@ import java.util.List;
  * @since 1.0 2025-02-10
  */
 @Service
-public class ShopProdUnitServiceImpl extends BaseServiceImpl<ShopProdUnitMapper, ShopProdUnit> implements ShopProdUnitService {
+public class ShopProdUnitServiceImpl extends ServiceImpl<ShopProdUnitMapper, ShopProdUnit> implements ShopProdUnitService {
 
     private QueryWrapper buildQueryWrapper(ShopProdUnitDTO param) {
-        QueryWrapper queryWrapper = super.buildPageQueryWrapper();
+        QueryWrapper queryWrapper = PageUtil.buildPageQueryWrapper();
         if (StrUtil.isEmpty(param.getName())) {
             queryWrapper.like(ShopProdUnit::getName, param.getName());
         }