hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b充值更改

Browse Source
This commit is contained in:
tianfeng 2025-12-03 16:40:24 +08:00
parent fdff177011
commit bce643360f
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/TeamBdMemberBillListQryExe.java
View File

@ -141,7 +141,10 @@ public class TeamBdMemberBillListQryExe {
userProfileGateway.mapByUserIds(agentIdSet)); userProfileGateway.mapByUserIds(agentIdSet));
// 7. 查询充值数据 // 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 团队一条） // 8. 组装成员账单列表（每个 Agent 团队一条）
List<TeamBdMemberBillCO> memberBillList = bdTeamList.stream() List<TeamBdMemberBillCO> memberBillList = bdTeamList.stream()
@ -294,12 +297,12 @@ public class TeamBdMemberBillListQryExe {
co.setTeamSalaryAmount(totalSalary); co.setTeamSalaryAmount(totalSalary);
// 8. 获取所有 Agent ID // 8. 获取所有 Agent ID
Set<Long> agentIdSet = bdTeamList.stream() Set<Long> teamIds = bdTeamList.stream()
.map(BusinessDevelopmentTeam::getAgentId) .map(BusinessDevelopmentTeam::getTeamId)
.collect(Collectors.toSet()); .collect(Collectors.toSet());
// 9. 查询充值数据并汇总 // 9. 查询充值数据并汇总
Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, agentIdSet); Map<Long, BigDecimal> rechargeMap = getRechargeMap(currentBillBelong, teamIds);
BigDecimal totalRecharge = rechargeMap.values().stream() BigDecimal totalRecharge = rechargeMap.values().stream()
.reduce(BigDecimal.ZERO, BigDecimal::add); .reduce(BigDecimal.ZERO, BigDecimal::add);
co.setTeamRechargeAmount(totalRecharge); co.setTeamRechargeAmount(totalRecharge);
@ -328,8 +331,8 @@ public class TeamBdMemberBillListQryExe {
} }
@NotNull @NotNull
private Map<Long, BigDecimal> getRechargeMap(Integer currentBillBelong, Set<Long> agentIdSet) { private Map<Long, BigDecimal> getRechargeMap(Integer currentBillBelong, Set<Long> teamIds) {
Map<Long, List<TeamMember>> mapByTeamIds = teamMemberService.mapByTeamIds(agentIdSet); Map<Long, List<TeamMember>> mapByTeamIds = teamMemberService.mapByTeamIds(teamIds);
List<Long> memberIds = mapByTeamIds.values().stream() List<Long> memberIds = mapByTeamIds.values().stream()
.flatMap(List::stream) .flatMap(List::stream)
.map(TeamMember::getMemberId) .map(TeamMember::getMemberId)