From a2515ad7a99a7dd98a19795fdcd456a86fba3564 Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Wed, 3 Sep 2025 18:12:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1-bugfixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/constant/dailytask/DailyTaskTypeEnum.java | 1 + .../business/vo/guild/GuildMemberWeekLevelRewardItemVo.java | 2 ++ .../business/service/dailytask/handler/GuildMicHandler.java | 2 +- .../service/dailytask/handler/GuildWeekRewardHandler.java | 3 --- .../service/guild/GuildMemberWeekLevelRewardV2Service.java | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java index a6245dbd0..f115d7b25 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/constant/dailytask/DailyTaskTypeEnum.java @@ -18,6 +18,7 @@ public enum DailyTaskTypeEnum { UP_MIC_COIN("UP_MIC_COIN"),//周上麦聊天(获得金币) ROOM_DAY_DIAMOND("ROOM_DAY_DIAMOND"),//房间日流水奖励 GUILD_WEEK_REWARD("GUILD_WEEK_REWARD"),//公会周奖励 + GUILD_WEEK_REWARD_V2("GUILD_WEEK_REWARD"),//公会周奖励(英语2区版本) ROOM_SEND_NOMAL_GIFT_GOLD("ROOM_SEND_NOMAL_GIFT_GOLD"),//房间送普通礼物礼单个送礼达到20000金币 ROOM_SEND_LUCKY_NUM("ROOM_SEND_LUCKY_NUM"),//送出77个lucky礼物 ROOM_SEND_BRAVO_NUM("ROOM_SEND_BRAVO_NUM"),//送出77个BRAVO礼物 diff --git a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberWeekLevelRewardItemVo.java b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberWeekLevelRewardItemVo.java index 6b563188b..160436c97 100644 --- a/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberWeekLevelRewardItemVo.java +++ b/accompany-business/accompany-business-sdk/src/main/java/com/accompany/business/vo/guild/GuildMemberWeekLevelRewardItemVo.java @@ -42,4 +42,6 @@ public class GuildMemberWeekLevelRewardItemVo { private BigDecimal bonusRewardNum; @ApiModelProperty("状态012") private Byte bonusStatus; + @ApiModelProperty("是否隐藏") + private boolean hideFlag; } diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildMicHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildMicHandler.java index 8d8aab1a8..2ba7ae515 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildMicHandler.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildMicHandler.java @@ -63,7 +63,7 @@ public class GuildMicHandler extends AbstractDailyTaskHandler { return null; } } - List guildWeekTaskList = guildTaskService.getGuildWeekTaskList(cycleDate, dailyTaskTypeEnum.getHandlerType(), taskDate, partitionId, guild.getId()); + List guildWeekTaskList = guildTaskService.getGuildWeekTaskList(cycleDate, dailyTaskTypeEnum.name(), taskDate, partitionId, guild.getId()); DailyTaskVo dailyTaskVo = new DailyTaskVo(); dailyTaskVo.setGuildTaskVos(guildWeekTaskList); ZonedDateTime weekEndTime = nowZonedDateTime.with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY)).withMinute(59).withHour(23).withSecond(59); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java index 342779da3..cf963cc4b 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildWeekRewardHandler.java @@ -10,7 +10,6 @@ import com.accompany.business.vo.dailytask.DailyProgressContext; import com.accompany.business.vo.dailytask.DailyTaskContext; import com.accompany.business.vo.dailytask.DailyTaskVo; import com.accompany.business.vo.guild.GuildMemberWeekLevelRewardVo; -import com.accompany.core.enumeration.PartitionEnum; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -39,10 +38,8 @@ public class GuildWeekRewardHandler extends AbstractDailyTaskHandler { Long uid = context.getUid(); GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid); if (guildMember == null) { - dailyTaskVo.setGuildWeekRewardItems(Collections.emptyList()); return null; } - PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId); List guildMemberWeekLevelRewardVos = guildMemberWeekLevelRewardService.listHistory(guildMember.getId(), partitionId, 1); if (CollectionUtils.isEmpty(guildMemberWeekLevelRewardVos)) { diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java index a2f5bafea..27ae8f2d9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardV2Service.java @@ -211,6 +211,7 @@ public class GuildMemberWeekLevelRewardV2Service extends ServiceImpl