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 summaryOfPendingPayments(PageVo pageVo) { PageHelper.startPage(pageVo.getPageNum(), pageVo.getPageSize()); List summaryOfPendingPaymentsList = manageWalletOutInMapper.summaryOfPendingPayments(); - System.out.println("起付额:"+summaryOfPendingPaymentsList); //查询起付额 List startPayments = manageBroadcastMapper.getStartPayments(summaryOfPendingPaymentsList); - - // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount . 这里可以优化一下,防止多key报错,不过一般不出这个问题 + // 创建一个 Map 用于存储第二个集合中元素的 user 和 coin 组合对应的 startPayAmount Map 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 ( (`miner_user` = #{item.user} AND coin = #{item.coin}) - ) +