From d88f886cefc1db0e76574ac2f6b55358d7a1e2c7 Mon Sep 17 00:00:00 2001
From: sangelxiu1 <15781802@163.com>
Date: Thu, 4 Sep 2025 09:02:20 +0800
Subject: [PATCH] =?UTF-8?q?##=20Opt=20-=20=E4=B8=9A=E7=BB=A9=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8-=E5=A4=8D=E8=B4=AD=E5=8F=96=E6=98=A8=E5=A4=A9(23:59:5?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CuMemberRetailAchieveServiceImpl.java      | 1 +
 .../src/main/java/com/hzs/common/core/utils/DateUtils.java  | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
index b242245a..3f622c48 100644
--- a/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
+++ b/bd-business/bd-business-member/src/main/java/com/hzs/retail/member/service/impl/CuMemberRetailAchieveServiceImpl.java
@@ -480,6 +480,7 @@ public class CuMemberRetailAchieveServiceImpl extends ServiceImpl<CuMemberRetail
         if(isCurrentMonth(param.getYear(), param.getMonth())) {
             targetDayStart = DateUtils.getFirstDayOfMonth(targetDate);
             targetDayEnd = DateUtils.beforeDate(1, ChronoUnit.DAYS, DateUtils.currentDate());
+            targetDayEnd = DateUtils.getEndOfDay(targetDayEnd);
             settlePeriod = iCuMemberSettlePeriodService.getCuMemberSettlePeriodByDate(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, targetDate));
         }else{
             settlePeriod = iCuMemberSettlePeriodService.getLastDayCuMemberSettlePeriod(param.getYear() + "-" + param.getMonth());
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java
index ee43274e..495c0b7b 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/utils/DateUtils.java
@@ -918,4 +918,10 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         return daysStrList;
     }
 
+    public static Date getEndOfDay(Date date) {
+        LocalDateTime localDateTime = date.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+        LocalDateTime endOfDay = localDateTime.withHour(23).withMinute(59).withSecond(59).withNano(999999999);
+        return Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
+    }
+
 }