From c33a55c2fbe8d99e89d53b89ad8dc2552eddb11b Mon Sep 17 00:00:00 2001
From: yyb <1416014977@qq.com>
Date: Fri, 30 Jan 2026 15:35:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20m2pool=20=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E4=B8=8B=E6=9E=B6=E5=B8=81=E7=A7=8D=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=8C=96=E7=9F=BF=E8=B4=A6=E6=88=B7=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=90=8E,=E5=BE=85=E6=94=AF=E4=BB=98=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E8=B5=B7=E4=BB=98?=
 =?UTF-8?q?=E9=A2=9D=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/service/impl/ManageUserServiceImpl.java     | 10 +++++-----
 .../resources/mapper/manage/ManageBroadcastMapper.xml  |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

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 82a296c..9f6a574 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
@@ -1,5 +1,6 @@
 package com.m2pool.manage.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.m2pool.common.core.Result.R;
@@ -249,17 +250,16 @@ public class ManageUserServiceImpl implements ManageUserService {
     public TableDataInfo<SummaryOfPendingPaymentsDto> summaryOfPendingPayments(PageVo pageVo) {
         PageHelper.startPage(pageVo.getPageNum(), pageVo.getPageSize());
         List<SummaryOfPendingPaymentsDto> summaryOfPendingPaymentsList = manageWalletOutInMapper.summaryOfPendingPayments();
-        System.out.println("起付额:"+summaryOfPendingPaymentsList);
         //查询起付额
         List<SummaryOfPendingPaymentsDto> startPayments = manageBroadcastMapper.getStartPayments(summaryOfPendingPaymentsList);
-
-        // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount  . 这里可以优化一下，防止多key报错，不过一般不出这个问题
+        // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount
         Map<String, BigDecimal> startPayAmountMap = startPayments.stream()
                 .collect(Collectors.toMap(
                         dto -> dto.getUser() + "_" + dto.getCoin(),
-                        SummaryOfPendingPaymentsDto::getStartPayAmount
+                        SummaryOfPendingPaymentsDto::getStartPayAmount,
+                        (existing, replacement) -> replacement
                 ));
-        System.out.println("起付额22:"+startPayAmountMap);
+
         // 遍历第一个集合，根据 user 和 coin 从 Map 中查找对应的 startPayAmount 并填充
         for (SummaryOfPendingPaymentsDto dto : summaryOfPendingPaymentsList) {
             String key = dto.getUser() + "_" + dto.getCoin();
diff --git a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml
index 230920a..b8d572f 100644
--- a/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml
+++ b/m2pool-modules/m2pool-manage/src/main/resources/mapper/manage/ManageBroadcastMapper.xml
@@ -167,10 +167,9 @@
             user_account_balance uab
                 JOIN user_miner_account uma ON uma.id = uab.ma_id
         WHERE
-        uab.status = 0   AND (
         <foreach collection="list" item="item" separator="OR">
             (`miner_user` = #{item.user} AND coin = #{item.coin})
-        </foreach>)
+        </foreach>
     </select>
 
     <select id="getAccountIdsByCoinAndStatus" resultType="com.m2pool.manage.dto.AccountIdsDto">
@@ -193,7 +192,7 @@
     </update>
 
     <update id="updateUserAccountBalanceStatusByIds">
-        UPDATE user_account_balance SET status = #{newStatus} WHERE ma_id IN
+        UPDATE user_account_balance SET status = #{newStatus} WHERE id IN
         <foreach collection="ids" item="id" separator="," open="(" close=")">
             #{id}
         </foreach>