From 63e339c40a8df909492a870771fb8df00814ef2a Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Mon, 20 Oct 2025 14:35:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=B0=8F=E6=97=B6=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/accompany/common/utils/DateTimeUtil.java  |  6 ++++++
 .../listener/SuperLuckyGiftDiamondIncomeListener.java  | 10 ++++++----
 .../business/service/guild/GuildGiftRecordService.java |  6 +++---
 .../com/accompany/business/util/CycleTimeUtil.java     |  6 ------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java
index 1c151bf09..fa4e52d88 100644
--- a/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java
+++ b/accompany-base/accompany-core/src/main/java/com/accompany/common/utils/DateTimeUtil.java
@@ -66,6 +66,7 @@ public class DateTimeUtil {
     public static final DateTimeFormatter hoursFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DATE_HOUR_PATTERN);
     public static final DateTimeFormatter monthWithoutZeroDateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.MONTH_WITHOUT_ZERO_DATE_PATTERN);
     public static final DateTimeFormatter datetimeReverseFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.ZONE_DATETIME_REVERSE_PATTERN);
+    public static final DateTimeFormatter dayHourFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_HOUR_PATTERN);
 
     public static final DateTimeFormatter yyyyMMdd = DateTimeFormatter.ofPattern("yyyyMMdd");
 
@@ -1159,4 +1160,9 @@ public class DateTimeUtil {
         return Date.from(eastEightZonedDateTime.toInstant());
     }
 
+    public static String getDayHourDate(Date time, String zoneId) {
+        ZonedDateTime zdt = DateTimeUtil.convertWithZoneId(time, zoneId);
+        return zdt.format(dateHourFormatter);
+    }
+
 }
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/SuperLuckyGiftDiamondIncomeListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/SuperLuckyGiftDiamondIncomeListener.java
index ca5838bec..6141eda02 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/SuperLuckyGiftDiamondIncomeListener.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/SuperLuckyGiftDiamondIncomeListener.java
@@ -3,10 +3,7 @@ package com.accompany.business.event.listener;
 import com.accompany.business.event.SuperLuckyGiftDiamondIncomeMessageEvent;
 import com.accompany.business.message.SuperLuckyGiftDiamondIncomeMessage;
 import com.accompany.business.model.guild.GuildMember;
-import com.accompany.business.service.guild.GuildDiamondStatisticsDayService;
-import com.accompany.business.service.guild.GuildMemberDiamondStatisticsService;
-import com.accompany.business.service.guild.GuildMemberService;
-import com.accompany.business.service.guild.GuildRankService;
+import com.accompany.business.service.guild.*;
 import com.accompany.business.service.guildpolicy2.GuildDiamondStatisticsPolicy2Service;
 import com.accompany.business.service.guildsoviet.ExtraDiamondDayService;
 import com.accompany.business.service.user.UsersService;
@@ -45,6 +42,8 @@ public class SuperLuckyGiftDiamondIncomeListener implements ApplicationListener<
     private GuildDiamondStatisticsPolicy2Service guildDiamondStatisticsPolicy2Service;
     @Autowired
     private ExtraDiamondDayService extraDiamondDayService;
+    @Autowired
+    private GuildDiamondStatisticsHourService guildDiamondStatisticsHourService;
 
     @Async
     @Override
@@ -84,6 +83,9 @@ public class SuperLuckyGiftDiamondIncomeListener implements ApplicationListener<
             }
             //todo 时区 zoneId
             guildRankService.updateRank(guildMember.getGuildId(), guildMember.getUid(), totalDiamondNum, receiver.getPartitionId());
+
+            String dayHourDate = DateTimeUtil.getDayHourDate(time, partitionInfo.getZoneId());
+            guildDiamondStatisticsHourService.updateHourDiamondStatistics(statDate, dayHourDate, guildMember, totalDiamondNum);
         }
 
         if (Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode()) && roomUid != null && roomUid > 0L) {
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java
index 1ee8e738c..48bee824d 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildGiftRecordService.java
@@ -99,11 +99,11 @@ public class GuildGiftRecordService extends ServiceImpl<GuildGiftRecordMapper, G
                 statDate = CycleTimeUtil.getCycleDay(createTime, partitionInfo.getZoneId());
                 extraDiamondDayService.updateGuildExtraDiamond(guildMember, cycleDate, statDate, totalDiamondNum, 0D, createTime);
             }
-            String dayHourDate = CycleTimeUtil.getDayHourDate(createTime, partitionInfo.getZoneId());
-            guildDiamondStatisticsHourService.updateHourDiamondStatistics(statDate, dayHourDate, guildMember, totalDiamondNum);
-
             guildRankService.updateRank(guildGiftRecord);
 
+            String dayHourDate = DateTimeUtil.getDayHourDate(createTime, partitionInfo.getZoneId());
+            guildDiamondStatisticsHourService.updateHourDiamondStatistics(statDate, dayHourDate, guildMember, totalDiamondNum);
+
             Date zoneTime = DateTimeUtil.withZoneSameInstant(giftSendRecord.getCreateTime(), partitionInfo.getZoneId());
             String monday = DateTimeUtil.convertDate(DateTimeUtil.getMondayDate(zoneTime), DateTimeUtil.DEFAULT_DATE_PATTERN);
             guildMemberWeekLevelRewardSelectService.addProcess(guildMember.getId(), guildMember.getPartitionId(), monday, giftSendRecord.getTotalDiamondNum());
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java
index a3c1d6c11..4b0c6f299 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/util/CycleTimeUtil.java
@@ -16,7 +16,6 @@ import java.util.List;
 public class CycleTimeUtil {
 
     private static final DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_PATTERN);
-    private static final DateTimeFormatter dateHourFormatter = DateTimeFormatter.ofPattern(DateTimeUtil.DEFAULT_DATE_HOUR_PATTERN);
 
     public static String getCurCycleDateByZoneId(String zoneId) {
         ZonedDateTime zdt = DateTimeUtil.getDateTimeByZoneId(zoneId);
@@ -149,9 +148,4 @@ public class CycleTimeUtil {
         Date cycleBeginDate = getAgencyCycleBeginDate(now);
         return DateUtil.formatDate(cycleBeginDate);
     }
-
-    public static String getDayHourDate(Date time, String zoneId) {
-        ZonedDateTime zdt = DateTimeUtil.convertWithZoneId(time, zoneId);
-        return zdt.format(dateHourFormatter);
-    }
 }