b充值更改
This commit is contained in:
parent
fdff177011
commit
bce643360f
@ -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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user