From 2014a01c7b294027e50c1e912ed0fba4b39e8a2c Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Fri, 17 Oct 2025 19:03:58 +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

---
 .../main/java/com/accompany/common/utils/DateTimeUtil.java  | 1 +
 .../business/service/guild/GuildGiftRecordService.java      | 4 ++++
 .../java/com/accompany/business/util/CycleTimeUtil.java     | 6 ++++++
 3 files changed, 11 insertions(+)

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 38756863c..1c151bf09 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
@@ -38,6 +38,7 @@ public class DateTimeUtil {
     public static final String DEFAULT_DATE_PATTERN__ = "yyyyMMddHHmmss";
     public static final String DEFAULT_TIME_PATTERN = "HH:mm:ss";
     public static final String DEFAULT_DATE_MINUTE_PATTERN = "yyyy-MM-dd HH:mm";
+    public static final String DEFAULT_DATE_HOUR_PATTERN = "yyyy-MM-dd HH";
     public static final String SIMPLE_MONTH_DATE_PATTERN = "M月d日";
     public static final String DATE_HOUR_PATTERN = "yyyyMMddHH";
     public static final String DATE_FORMAT_YEAR_MONTH = "yyyyMM";
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 8744c24fd..1ee8e738c 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
@@ -52,6 +52,8 @@ public class GuildGiftRecordService extends ServiceImpl<GuildGiftRecordMapper, G
     private GuildDiamondStatisticsPolicy2Service guildDiamondStatisticsPolicy2Service;
     @Autowired
     private ExtraDiamondDayService extraDiamondDayService;
+    @Autowired
+    private GuildDiamondStatisticsHourService guildDiamondStatisticsHourService;
 
     @Async
     public void insertGuildGiftRecord(GiftSendRecord giftSendRecord) {
@@ -97,6 +99,8 @@ 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);
 
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 4b0c6f299..a3c1d6c11 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,6 +16,7 @@ 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);
@@ -148,4 +149,9 @@ 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);
+    }
 }