Merge remote-tracking branch 'origin/master'

# Conflicts:
#	cash-api/order-server/src/main/resources/application.yml

cash-common/cash-common-service/src/main/java/com/czg/account/entity/MerchantRegister.java

@@ -41,7 +41,7 @@ public class MerchantRegister implements Serializable {
     /**
      * 店铺id
      */
-    private String shopId;
+    private Long shopId;
 
     /**
      * 激活码金额

cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopActivateCouponRecordService.java

@@ -1,11 +1,10 @@
 package com.czg.account.service;
 
 import com.czg.account.dto.QueryReceiveDto;
+import com.czg.account.entity.ShopActivateCouponRecord;
 import com.czg.account.vo.CouponReceiveVo;
 import com.czg.account.vo.UserCouponVo;
-import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
-import com.czg.account.entity.ShopActivateCouponRecord;
 
 import java.util.List;
 
@@ -18,9 +17,9 @@ import java.util.List;
 public interface ShopActivateCouponRecordService extends IService<ShopActivateCouponRecord> {
 
 
-    Page<CouponReceiveVo> queryReceive(Page<CouponReceiveVo> page, QueryReceiveDto param);
+    List<CouponReceiveVo> queryReceive(QueryReceiveDto param);
 
-    Page<ShopActivateCouponRecord> findByUser(Page<ShopActivateCouponRecord> page, List<Long> shopUserIds, Integer status);
+    List<ShopActivateCouponRecord> findByUser(List<Long> shopUserIds, Integer status);
 
     List<UserCouponVo> queryByVipIdAndShopId(Long shopId, Long shopUserId);
 }

cash-common/cash-common-tools/pom.xml

@@ -47,6 +47,20 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.jsqlparser</groupId>
+                    <artifactId>jsqlparser</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>sqlparser4.5</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>

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

@@ -2,6 +2,7 @@ package com.czg.utils;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.servlet.http.HttpServletRequest;
@@ -77,4 +78,17 @@ public class PageUtil {
         }
         return queryWrapper;
     }
+
+    /**
+     * pageHelper 转为 mybatisflex 分页
+     */
+    public static <T> Page<T> convert(PageInfo<T> page) {
+        Page<T> page1 = new Page<>();
+        page1.setPageNumber(page.getPageNum());
+        page1.setPageSize(page.getPageSize());
+        page1.setTotalRow(page.getTotal());
+        page1.setTotalPage(page.getPages());
+        page1.setRecords(page.getList());
+        return page1;
+    }
 }