From bce643360f0462995f395a42c1df411429b3fa12 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Wed, 3 Dec 2025 16:40:24 +0800
Subject: [PATCH] =?UTF-8?q?b=E5=85=85=E5=80=BC=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bd/query/TeamBdMemberBillListQryExe.java      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
index c373e9b8..7e5a2954 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
@@ -141,7 +141,10 @@ public class TeamBdMemberBillListQryExe {
                 userProfileGateway.mapByUserIds(agentIdSet));
 
         // 7. 查询充值数据
-        Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, agentIdSet);
+        Set<Long> teamIds = bdTeamList.stream()
+                .map(BusinessDevelopmentTeam::getTeamId)
+                .collect(Collectors.toSet());
+        Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, teamIds);
 
         // 8. 组装成员账单列表（每个 Agent 团队一条）
         List<TeamBdMemberBillCO> memberBillList = bdTeamList.stream()
@@ -294,12 +297,12 @@ public class TeamBdMemberBillListQryExe {
         co.setTeamSalaryAmount(totalSalary);
         
         // 8. 获取所有 Agent ID
-        Set<Long> agentIdSet = bdTeamList.stream()
-                .map(BusinessDevelopmentTeam::getAgentId)
+        Set<Long> teamIds = bdTeamList.stream()
+                .map(BusinessDevelopmentTeam::getTeamId)
                 .collect(Collectors.toSet());
         
         // 9. 查询充值数据并汇总
-        Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, agentIdSet);
+        Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, teamIds);
         BigDecimal totalRecharge = rechargeMap.values().stream()
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         co.setTeamRechargeAmount(totalRecharge);
@@ -328,8 +331,8 @@ public class TeamBdMemberBillListQryExe {
     }
 
     @NotNull
-    private Map<Long, BigDecimal> getRechargeMap(Integer currentBillBelong, Set<Long> agentIdSet) {
-        Map<Long, List<TeamMember>> mapByTeamIds = teamMemberService.mapByTeamIds(agentIdSet);
+    private Map<Long, BigDecimal> getRechargeMap(Integer currentBillBelong, Set<Long> teamIds) {
+        Map<Long, List<TeamMember>> mapByTeamIds = teamMemberService.mapByTeamIds(teamIds);
         List<Long> memberIds = mapByTeamIds.values().stream()
                 .flatMap(List::stream)
                 .map(TeamMember::getMemberId)