From dba02832467f44207050dc310f915cc57b272ac3 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 30 Jul 2025 09:48:09 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E6=9F=A5=E8=AF=A2=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=97=B6=E9=97=B4=E6=96=B9=E6=B3=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BonusSettleServiceImpl.java     |  2 +-
 .../com/hzs/common/core/utils/DateUtils.java     | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
index e1b1471c..6bd09141 100644
--- a/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
+++ b/bd-business/bd-business-bonus/src/main/java/com/hzs/bonus/bonus/service/impl/BonusSettleServiceImpl.java
@@ -488,7 +488,7 @@ public class BonusSettleServiceImpl implements IBonusSettleService {
             // 获取所有国家的奖金项 key = 国家 + 奖金项的值
             BonusConfigDTO bonusConfigDTO = iBonusItemsServiceApi.queryBonusConfigDTO().getData();
             // 获取所有区域配置（key:省-市-区，value:会员ID）
-            Map<String, Long> memberRegionMap = iMemberServiceApi.memberRegionMap(DateUtils.getEndTime(currentSettleDate)).getData();
+            Map<String, Long> memberRegionMap = iMemberServiceApi.memberRegionMap(DateUtils.getEndTimeOther(currentSettleDate)).getData();
 
             //*********************************计算奖衔 更新奖衔*********************************/
             // 开始计算奖衔 计算奖衔 更新奖衔（根据最新业绩查询变动且业绩满足下一等级，根据等级判断是否满足考核，安置考核或血缘考核）
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 5760ffb4..c33ff760 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
@@ -650,6 +650,22 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
         todayEnd.set(Calendar.MILLISECOND, 999);
         return todayEnd.getTime();
     }
+    /**
+     * 查询结束时间（毫秒给0）
+     *
+     * @return Date
+     */
+    public static Date getEndTimeOther(Date date) {
+        Calendar todayEnd = Calendar.getInstance();
+        if (null != date) {
+            todayEnd.setTime(date);
+        }
+        todayEnd.set(Calendar.HOUR_OF_DAY, 23);
+        todayEnd.set(Calendar.MINUTE, 59);
+        todayEnd.set(Calendar.SECOND, 59);
+        todayEnd.set(Calendar.MILLISECOND, 0);
+        return todayEnd.getTime();
+    }
 
     /**
      * 获取月第一天