From 1cab57baa7cd0f35d6c0b188e7c2713927d00fba Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Thu, 16 Oct 2025 19:27:39 +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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/guildpolicy2/GuildPolicy2Service.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 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 fca60be4c..fc812112d 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 @@ -37,7 +37,6 @@ import java.math.BigDecimal; import java.time.Instant; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.time.temporal.TemporalAdjusters; import java.util.*; import java.util.concurrent.ThreadPoolExecutor; import java.util.stream.Collectors; @@ -207,10 +206,13 @@ public class GuildPolicy2Service { } List uids = memberData.stream().map(GuildPolicy2MemberVo::getUid).collect(Collectors.toList()); - ZonedDateTime cycleBeginDateZoneDate = DateTimeUtil.convertWithZoneId(DateUtil.parseDate(cycleBeginDate), partitionEnum.getZoneId()); + + Date cycleBegin = DateUtil.parseDate(cycleBeginDate); + Date cycleEnd = DateUtil.endOfMonth(cycleBegin); + ZonedDateTime cycleBeginDateZoneDate = DateTimeUtil.convertWithZoneId(cycleBegin, partitionEnum.getZoneId()); ZonedDateTime zoneBeginTime = cycleBeginDateZoneDate.withHour(0).withMinute(0).withSecond(0).withNano(0); - ZonedDateTime zoneEndTime = cycleBeginDateZoneDate.with(TemporalAdjusters.lastDayOfMonth()) - .withHour(23).withMinute(59).withSecond(59).withNano(999_999_999); + ZonedDateTime cycleEndDateZoneDate = DateTimeUtil.convertWithZoneId(cycleEnd, partitionEnum.getZoneId()); + ZonedDateTime zoneEndTime = cycleEndDateZoneDate.withHour(23).withMinute(59).withSecond(59).withNano(999_999_999); Date beginOfMonth = DateTimeUtil.convertToEastEightZone(zoneBeginTime); Date endOfMonth = DateTimeUtil.convertToEastEightZone(zoneEndTime);