From 2a026f8bb4495056c295b6ccf4c50416fcf8a1d9 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Mon, 20 Oct 2025 15:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=9F=E8=80=B3=E5=85=B6=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E8=96=AA=E8=B5=84-bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../guildpolicy2/GuildPolicy2Service.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java index 37aa087ac..cecae1348 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildpolicy2/GuildPolicy2Service.java @@ -120,11 +120,16 @@ public class GuildPolicy2Service { guildPolicy2MyVo.setCurCycleDate(curCycleBeginDate); List myMicData = guildMicStatisticsPolicy2Service.listPersonalMicData(cycleBeginDate, guildMemberId); + Integer micDay = 0; + if (CollectionUtils.isNotEmpty(myMicData)) { + micDay = myMicData.stream().collect(Collectors.summingInt(GuildPolicy2PersonalVo::getMicDay)); + } + guildPolicy2MyVo.setMicDay(micDay); if (isCurrentOrPastCycle(cycleBeginDate, curCycleBeginDate)) {// 当前周期 guildPolicy2MyVo.setDiamondNum(guildDiamondStatisticsPolicy2Service.getTotalDiamondInCycleMember(cycleBeginDate, guildMemberId)); TreeMap diamondWageMap = guildDiamondWagePolicy2Service.getDiamondWageMap(partitionEnum.getId()); - GuildPolicy2SalaryVo salaryVo = guildDiamondWagePolicy2Service.getSalaryVo(diamondWageMap, guildPolicy2MyVo.getDiamondNum(), guildPolicy2MyVo.getMicDay()); + GuildPolicy2SalaryVo salaryVo = guildDiamondWagePolicy2Service.getSalaryVo(diamondWageMap, guildPolicy2MyVo.getDiamondNum(), micDay); guildPolicy2MyVo.setMySalary(salaryVo); } else { GuildDiamondStatisticsPolicy2Settle settleMap = guildDiamondStatisticsPolicy2SettleService @@ -138,22 +143,17 @@ public class GuildPolicy2Service { .diamondNum(settleMap.getDiamondNum()) .micSalary(settleMap.getAnchorMicSalary()) .ownerSalary(settleMap.getOwnerSalary()) + .micDay(micDay) .build()); } - this.fillPersonDetailData(cycleBeginDate, guildMemberId, myMicData, guildPolicy2MyVo, partitionEnum); + this.fillPersonDetailData(cycleBeginDate, guildMemberId, myMicData, guildPolicy2MyVo, partitionEnum, micDay); return BusiResult.success(guildPolicy2MyVo); } - private void fillPersonDetailData(String cycleBeginDate, Long guildMemberId, List myMicData, GuildPolicy2MyVo guildPolicy2MyVo, PartitionEnum partitionEnum) { + private void fillPersonDetailData(String cycleBeginDate, Long guildMemberId, List myMicData, GuildPolicy2MyVo guildPolicy2MyVo, PartitionEnum partitionEnum, Integer micDay) { List myDiamondData = guildDiamondStatisticsPolicy2Service.listPersonalDiamondData(cycleBeginDate, guildMemberId); List myData = this.mergeMyDataLists(myDiamondData, myMicData); - - if (CollectionUtils.isNotEmpty(myData)) { - Integer micDay = myData.stream().collect(Collectors.summingInt(GuildPolicy2PersonalVo::getMicDay)); - guildPolicy2MyVo.setMicDay(micDay); - guildPolicy2MyVo.getMySalary().setMicDay(micDay); - } //填满整月天数 List resultMyDate = new ArrayList<>(); ZonedDateTime nowZoneDateTime = DateTimeUtil.convertWithZoneId(new Date(), partitionEnum.getZoneId());