|
@@ -141,9 +141,7 @@ public class AppAgentController extends BaseController {
|
|
|
vo.setLiveCommission(BigDecimal.valueOf(appUserCountList.stream().mapToDouble(e->e.getLiveCommission()).sum()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
vo.setGameCommission(BigDecimal.valueOf(appUserCountList.stream().mapToDouble(e->e.getGameCommission()).sum()).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
|
|
|
//团队人数
|
|
|
- vo.setTeamUser(appUserAgentList.stream().filter(e->
|
|
|
- compareTime(e.getCreateTime(),beginDate,endDate)
|
|
|
- ).collect(Collectors.toList()).size());
|
|
|
+ vo.setTeamUser(appUserAgentList.stream().collect(Collectors.toList()).size());
|
|
|
//团队充值
|
|
|
vo.setTeamRecharge(BigDecimal.valueOf(appUserCountList.stream().mapToDouble(e->{
|
|
|
return (e.getRechargeAmount() - e.getRechargeGive()) + e.getRechargeCommission();
|