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