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) {