From 272111e246754c1589b593fa1823656a90b0bb5c Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Wed, 3 Sep 2025 14:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=B8=B8=E4=BB=BB=E5=8A=A1-=E4=B8=BB?=
 =?UTF-8?q?=E6=92=AD=E5=91=A8=E5=A5=96=E5=8A=B1=E9=87=91=E8=B1=86=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dailytask/AbstractDailyTaskHandler.java         | 1 +
 .../service/dailytask/handler/GuildCreateHandler.java       | 3 ++-
 .../business/service/guildtask/GuildTaskService.java        | 6 ++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java
index f5b1c28b5..0cb7286d2 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/AbstractDailyTaskHandler.java
@@ -152,6 +152,7 @@ public abstract class AbstractDailyTaskHandler implements DailyTaskHandler {
                 userGoldBeanService.addGoldBean(uid, BigDecimal.valueOf(configReward.getAwardNum()), GoldBeanBillType.TASK_GAIN,
                         String.valueOf(dailyTaskTypeEnum.ordinal()), 1, dailyTaskVo.getTaskType().name(),
                         dailyTaskVo.getReachNum(), dailyTaskVo.getStandardValue(), receiveDate);
+                continue;
             }
             BillObjTypeEnum goldBillObjTypeEnum = null;
             if(RewardTypeEnum.GOLD.getType().equals(configReward.getAwardType())) {
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildCreateHandler.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildCreateHandler.java
index 22548f04b..019cb37d4 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildCreateHandler.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/dailytask/handler/GuildCreateHandler.java
@@ -57,7 +57,8 @@ public class GuildCreateHandler extends AbstractDailyTaskHandler {
         if (expire) {
             dailyTaskVo.setReceiveStatus(DailyTaskConstant.ReceiveStatus.EXPIRE);
             for (GuildTaskLevelInfoVo infoVo : guildCreateTaskList) {
-                if (infoVo.getReceiveStatus().equals(DailyTaskConstant.ReceiveStatus.UNCOMPLETED)) {
+                if (infoVo.getReceiveStatus().equals(DailyTaskConstant.ReceiveStatus.UNCOMPLETED)
+                        || infoVo.getReceiveStatus().equals(DailyTaskConstant.ReceiveStatus.AVAILABLE)) {
                     infoVo.setReceiveStatus(DailyTaskConstant.ReceiveStatus.EXPIRE);
                 }
             }
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java
index b36b2aa05..cec98cb57 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guildtask/GuildTaskService.java
@@ -469,6 +469,7 @@ public class GuildTaskService {
                 userGoldBeanService.addGoldBean(uid, BigDecimal.valueOf(configReward.getAwardNum()), GoldBeanBillType.TASK_GAIN,
                         String.valueOf(configReward.getId()), 1, dailyTaskTypeEnum.name(), 1L, 1L,
                         nowZonedDateTime.format(DateTimeUtil.dateFormatter));
+                continue;
             }
             BillObjTypeEnum goldBillObjTypeEnum = null;
             if (RewardTypeEnum.GOLD.getType().equals(configReward.getAwardType())) {
@@ -476,8 +477,9 @@ public class GuildTaskService {
             } else if (RewardTypeEnum.DIAMOND.getType().equals(configReward.getAwardType())) {
                 goldBillObjTypeEnum = GUILD_TASK_DIAMOND;
             }
-            rewardUtil.sendRewardByType(uid, RewardTypeEnum.getByRewardType(configReward.getAwardType()), configReward.getAwardId().intValue(),
-                    configReward.getAwardNum().intValue(), dailyTaskTypeEnum.name(), Boolean.FALSE, goldBillObjTypeEnum);
+            rewardUtil.sendRewardByType(configReward.getUid(), RewardTypeEnum.getByRewardType(configReward.getAwardType()),
+                    configReward.getAwardId().intValue(), configReward.getAwardNum().intValue(),
+                    dailyTaskTypeEnum.name(), Boolean.FALSE, goldBillObjTypeEnum);
         }
         return BusiResult.success();
     }