From f0a2309b42fad54ef1dd4d3b4d5c4d5fc86813ae Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Fri, 5 Sep 2025 14:18:23 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=BC=80?=
 =?UTF-8?q?=E5=85=B3=EF=BC=8C=E6=94=B6=E7=9B=8A=E5=85=A5=E5=BA=93=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E4=BF=AE=E6=94=B9=E3=80=82=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=94=A8=E6=88=B7=E5=BE=85=E6=94=AF=E4=BB=98=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=20=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ManageUserController.java      |  6 ++---
 .../manage/service/ManageUserService.java     |  2 +-
 .../service/impl/ManageUserServiceImpl.java   | 24 +++++++++++++------
 .../mapper/manage/ManageWalletOutInMapper.xml |  2 +-
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java
index 6f943c1..cf3f6fd 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/controller/ManageUserController.java
@@ -80,11 +80,11 @@ public class ManageUserController {
     }
 
 
-    @GetMapping("/summaryOfPendingPayments")
+    @PostMapping("/summaryOfPendingPayments")
     @ApiOperation(value = "管理系统:用户待支付汇总")
     @RequiresLogin
     @RequiresRoles(value = {"back_admin","admin"}, logical = Logical.OR)
-    public R<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments(){
-        return manageUserService.summaryOfPendingPayments();
+    public TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(@RequestBody PageVo pageVo){
+        return manageUserService.summaryOfPendingPayments(pageVo);
     }
 }
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java
index e46f2aa..05a7d24 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/ManageUserService.java
@@ -67,5 +67,5 @@ public interface ManageUserService{
      * @param coinVo
      * @return
      */
-    R<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments();
+    TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(PageVo pageVo);
 }
diff --git a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
index 12bbaf0..0160728 100644
--- a/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
+++ b/m2pool-modules/m2pool-manage/src/main/java/com/m2pool/manage/service/impl/ManageUserServiceImpl.java
@@ -245,7 +245,8 @@ public class ManageUserServiceImpl implements ManageUserService {
     }
 
     @Override
-    public R<List<SummaryOfPendingPaymentsDto>> summaryOfPendingPayments() {
+    public TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(PageVo pageVo) {
+        PageHelper.startPage(pageVo.getPageNum(), pageVo.getPageSize());
         List<SummaryOfPendingPaymentsDto> summaryOfPendingPaymentsList = manageWalletOutInMapper.summaryOfPendingPayments();
         System.out.println("起付额:"+summaryOfPendingPaymentsList);
         //查询起付额
@@ -261,12 +262,21 @@ public class ManageUserServiceImpl implements ManageUserService {
         // 遍历第一个集合，根据 user 和 coin 从 Map 中查找对应的 startPayAmount 并填充
         for (SummaryOfPendingPaymentsDto dto : summaryOfPendingPaymentsList) {
             String key = dto.getUser() + "_" + dto.getCoin();
-            if (startPayAmountMap.containsKey(key)) {
-                dto.setStartPayAmount(startPayAmountMap.get(key));
-            }else{
-                dto.setStartPayAmount(BigDecimal.ZERO);
-            }
+            dto.setStartPayAmount(startPayAmountMap.getOrDefault(key, BigDecimal.ZERO));
         }
-        return R.success(summaryOfPendingPaymentsList);
+        return getPageData(summaryOfPendingPaymentsList);
+    }
+
+    private TableDataInfo<SummaryOfPendingPaymentsDto> getPageData(List<SummaryOfPendingPaymentsDto> list)
+    {
+        TableDataInfo<SummaryOfPendingPaymentsDto> rspData = new TableDataInfo<>();
+        rspData.setCode(HttpStatus.SUCCESS);
+        rspData.setRows(list);
+        rspData.setMsg("查询成功");
+        PageInfo<SummaryOfPendingPaymentsDto> pageInfo = new PageInfo<>(list);
+        rspData.setTotal(pageInfo.getTotal());
+        rspData.setTotalPage(pageInfo.getPages());
+        PageHelper.clearPage();
+        return rspData;
     }
 }
diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml
index 13386f7..7eb6dcc 100644
--- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml
+++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageWalletOutInMapper.xml
@@ -45,6 +45,6 @@
         </where>
     </select>
     <select id="summaryOfPendingPayments" resultType="com.m2pool.manage.dto.SummaryOfPendingPaymentsDto">
-        select coin, max(max_height) as maxHeight, max(should_out_date) AS shouldOutDate, `user`, sum(amount) as needPayAmount from wallet_in where state = 2 group by coin,`user`;
+        select coin, max(max_height) as maxHeight, max(should_out_date) AS shouldOutDate, `user`, sum(amount) as needPayAmount from wallet_in where state = 2 group by coin,`user`
     </select>
 </mapper>