From 8f31f3ea4fa9feea012bef9bce5a36d174a9a5cf Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Thu, 7 Aug 2025 17:24:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/guildgame/GameUsdService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildgame/GameUsdService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildgame/GameUsdService.java index e915d357f..b3c05b95d 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildgame/GameUsdService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildgame/GameUsdService.java @@ -105,9 +105,10 @@ public class GameUsdService { GuildGameDayVo guildGameDayVo = new GuildGameDayVo(); guildGameSalaryVo.setGameDayVo(guildGameDayVo); guildGameDayVo.setMonthDate(monthDate); - guildGameDayVo.setDayDetailList(this.getGameDayDetailList(guildMember.getId(), monthDate, partitionId, nowZoneDateTime)); + List gameDayDetailList = this.getGameDayDetailList(guildMember.getId(), monthDate, partitionId, nowZoneDateTime); + guildGameDayVo.setDayDetailList(gameDayDetailList); - guildGameDayVo.setReceivedSalary(guildGameDayVo.getDayDetailList().stream() + guildGameDayVo.setReceivedSalary(gameDayDetailList.stream() .filter(x -> x.getReceiveStatus() == GuildGameConstant.ReceiveStatus.RECEIVED) .map(GuildGameDayDetailVo::getDaySalary) .reduce(BigDecimal.ZERO, BigDecimal::add)); @@ -130,6 +131,7 @@ public class GameUsdService { .statDate(gameDiamondStatDay.getStatDate()) .playGameNum(gameDiamondStatDay.getPlayGameNum()) .daySalary(baseSalary) + .receiveStatus(gameDiamondStatDay.getReceiveStatus()) .build(); realMap.put(gameDiamondStatDay.getStatDate(), guildGameDayDetailVo); });