From 0b8e742bb821ae121c9893864bfeca78af2a52a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?=
 <8605635+zhang3064194730@user.noreply.gitee.com>
Date: Mon, 10 Mar 2025 14:59:19 +0800
Subject: [PATCH] =?UTF-8?q?ShopPushOpenId=E8=BF=94=E5=9B=9E=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../czg/controller/admin/ShopMsgPushController.java  |  3 ++-
 .../czg/account/service/ShopPushOpenIdService.java   |  5 ++---
 .../service/impl/ShopPushOpenIdServiceImpl.java      | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMsgPushController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMsgPushController.java
index fe6d5d2d..801822f1 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMsgPushController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopMsgPushController.java
@@ -8,6 +8,7 @@ import com.czg.account.service.ShopPushOpenIdService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import org.springframework.http.ResponseEntity;
@@ -54,7 +55,7 @@ public class ShopMsgPushController {
      */
     @SaAdminCheckPermission("shopMsgPush:list")
     @GetMapping
-    public CzgResult<List<ShopPushOpenId>> allInfo() {
+    public CzgResult<Page<ShopPushOpenId>> allInfo() {
         return CzgResult.success(shopPushOpenIdService.pageInfo(StpKit.USER.getShopId()));
     }
 
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPushOpenIdService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPushOpenIdService.java
index a7263049..609b2ff3 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPushOpenIdService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopPushOpenIdService.java
@@ -1,11 +1,10 @@
 package com.czg.account.service;
 
 import com.czg.account.dto.msg.ShopPushOpenIdEditDTO;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
 import com.czg.account.entity.ShopPushOpenId;
 
-import java.util.List;
-
 /**
  * 用户推送信息表 服务层。
  *
@@ -14,7 +13,7 @@ import java.util.List;
  */
 public interface ShopPushOpenIdService extends IService<ShopPushOpenId> {
 
-    List<ShopPushOpenId> pageInfo(Long shopId);
+    Page<ShopPushOpenId> pageInfo(Long shopId);
 
     Boolean edit(Long shopId, ShopPushOpenIdEditDTO shopPushOpenIdEditDTO);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPushOpenIdServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPushOpenIdServiceImpl.java
index 2fdff9d5..d783f268 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPushOpenIdServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopPushOpenIdServiceImpl.java
@@ -4,6 +4,8 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.msg.ShopPushOpenIdEditDTO;
 import com.czg.exception.ApiNotPrintException;
+import com.czg.utils.PageUtil;
+import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.account.entity.ShopPushOpenId;
@@ -11,8 +13,6 @@ import com.czg.account.service.ShopPushOpenIdService;
 import com.czg.service.account.mapper.ShopPushOpenIdMapper;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * 用户推送信息表 服务层实现。
  *
@@ -23,12 +23,12 @@ import java.util.List;
 public class ShopPushOpenIdServiceImpl extends ServiceImpl<ShopPushOpenIdMapper, ShopPushOpenId> implements ShopPushOpenIdService{
 
     @Override
-    public List<ShopPushOpenId> pageInfo(Long shopId) {
+    public Page<ShopPushOpenId> pageInfo(Long shopId) {
 //        PageHelper.startPage(PageUtil.buildPageHelp());
 //        return PageUtil.convert(new PageInfo<>(mapper.pageInfo(shopId)));
-        List<ShopPushOpenId> list = list(new QueryWrapper().eq(ShopPushOpenId::getShopId, shopId));
-        list.forEach(item -> item.setTypeInfo(JSONArray.parseArray((String) item.getTypeInfo())));
-        return list;
+        Page<ShopPushOpenId> page = page(PageUtil.buildPage(), new QueryWrapper().eq(ShopPushOpenId::getShopId, shopId));
+        page.getRecords().forEach(item -> item.setTypeInfo(JSONArray.parseArray((String) item.getTypeInfo())));
+        return page;
     }
 
     @Override