From 6684f12931e2ccb1ae7eb9eee43c761cddfeda62 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Mon, 26 May 2025 10:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E8=96=AA=E8=B5=84=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E8=87=AA=E5=8A=A8=E5=8F=91=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guild/AgencyMonthSettleService.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java index 3d3a08965..0995bcf09 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/AgencyMonthSettleService.java @@ -93,20 +93,20 @@ public class AgencyMonthSettleService { agencyMonthSettleDetails.add(agencyMonthSettleDetail); } agencyMonthSettleDetailService.saveBatch(agencyMonthSettleDetails); -// -// sendMessage(agencyMonthSettleDetails); -// -// for (UserHallEnergyLevelDataVo dataVo : userHallEnergyLevelDataVos) { -// if (dataVo.getHallSalary().doubleValue() == 0) { -// continue; -// } -// guildUsdOperateService.settlementGold(dataVo.getHallId(), dataVo.getUid(), dataVo.getHallSalary()); -// } -// -// Map uidSalaryMap = agencyMonthSettleDetails.stream() -// .filter(d->d.getHallSalary().compareTo(BigDecimal.ZERO) > 0) -// .collect(Collectors.toMap(AgencyMonthSettleDetail::getUid, AgencyMonthSettleDetail::getHallSalary)); -// sendSecretMessage(partitionId, uidSalaryMap); + + sendMessage(agencyMonthSettleDetails); + + for (UserHallEnergyLevelDataVo dataVo : userHallEnergyLevelDataVos) { + if (dataVo.getHallSalary().doubleValue() == 0) { + continue; + } + guildUsdOperateService.settlementGold(dataVo.getHallId(), dataVo.getUid(), dataVo.getHallSalary()); + } + + Map uidSalaryMap = agencyMonthSettleDetails.stream() + .filter(d->d.getHallSalary().compareTo(BigDecimal.ZERO) > 0) + .collect(Collectors.toMap(AgencyMonthSettleDetail::getUid, AgencyMonthSettleDetail::getHallSalary)); + sendSecretMessage(partitionId, uidSalaryMap); } public void sendSecretMessage(int partitionId, Map uidSalaryMap) {