From 3eb4c280b051c45647467daff66f4965dd75b23c Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Tue, 26 Aug 2025 17:43:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1-=E5=85=AC?=
 =?UTF-8?q?=E4=BC=9A=E5=91=A8=E5=A5=96=E5=8A=B1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/constant/dailytask/DailyTaskTypeEnum.java |  1 +
 .../business/service/dailytask/DailyTaskService.java   | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

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 03f4c6173..6bcd6215e 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
@@ -15,6 +15,7 @@ public enum DailyTaskTypeEnum {
     RECV_NOMAL_GIFT_GOLD("RECV_NOMAL_GIFT_GOLD"),//收到礼物(价值超过2w金币)
     UP_MIC_COIN("UP_MIC_COIN"),//上麦聊天(获得金币)
     ROOM_DAY_DIAMOND("ROOM_DAY_DIAMOND"),//房间日流水奖励
+    GUILD_WEEK_REWARD(""),//公会周奖励
     ;
 
     private String handlerType;
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/DailyTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/DailyTaskService.java
index 327d7f498..73e9d6233 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/DailyTaskService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/DailyTaskService.java
@@ -30,6 +30,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.accompany.business.constant.dailytask.DailyTaskTypeEnum.GUILD_WEEK_REWARD;
+
 
 @Slf4j
 @Service
@@ -118,13 +120,16 @@ public class DailyTaskService {
      */
     public List<DailyTaskVo> tasks(Long uid, Integer taskTabType) {
         GuildMember guildMember = guildMemberService.getVaildGuildMemberByUid(uid);
-        List<Byte> taskRole = Stream.of(GuildConstant.RoleType.NORMAL)
+        List<Byte> taskRole = Stream.of((byte)0)
                 .collect(Collectors.toList());
 
         Optional.ofNullable(guildMember).ifPresent(member -> {
             taskRole.add(member.getRoleType());
             if (member.getRoleType() == GuildConstant.RoleType.OWNER) {
+                taskRole.add(GuildConstant.RoleType.NORMAL);
                 taskRole.add(GuildConstant.RoleType.MANAGER);
+            } else if (member.getRoleType() == GuildConstant.RoleType.MANAGER) {
+                taskRole.add(GuildConstant.RoleType.NORMAL);
             }
         });
 
@@ -145,6 +150,9 @@ public class DailyTaskService {
         }
 
         dailyTaskVos.stream().forEach(dailyTaskVo -> {
+            if (GUILD_WEEK_REWARD.equals(dailyTaskVo.getTaskType())) {
+                return;
+            }
             executeDailyTask(dailyTaskVo, uid, partitionId);
         });