diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamQryExe.java index fd08b21d..c2ab4112 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamQryExe.java @@ -116,8 +116,8 @@ public class BdTeamQryExe { overview.setTeamTotalIncome(teamTotal); // TODO: 查询当前用户的收入汇总(从历史结算记录查询) - overview.setTotalIncome(BigDecimal.valueOf(1000)); - overview.setPreviousPeriodIncome(BigDecimal.valueOf(1000)); + overview.setTotalIncome(teamTotal); + overview.setPreviousPeriodIncome(BigDecimal.valueOf(0)); return overview; } @@ -178,16 +178,6 @@ public class BdTeamQryExe { return Collections.emptyList(); } - Set bdIdSet = bdList.stream().map(BusinessDevelopmentBaseInfo::getUserId) - .filter(e -> !e.equals(bdLeaderUserId)) - .collect(Collectors.toSet()); - List roomBdLeads = roomBdLeadService.listByUserIds(bdIdSet); - - List bdLeaderIdList = roomBdLeads.stream().map(RoomBdLead::getUserId).toList(); - bdList = bdList.stream() - .filter(e -> !bdLeaderIdList.contains(e.getUserId())) - .toList(); - Set bdUserIdSet = bdList.stream() .map(BusinessDevelopmentBaseInfo::getUserId) .collect(Collectors.toSet());