This commit is contained in:
2025-08-07 17:24:47 +08:00
parent ccc342f1ca
commit 8f31f3ea4f

View File

@@ -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<GuildGameDayDetailVo> 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);
});