From da7ee118c35cbb971dfdca64775a0aa4a6d1fbc9 Mon Sep 17 00:00:00 2001
From: dingchaolin <dingchaolin@bantus.cn>
Date: Fri, 3 Mar 2023 19:54:05 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix(guild):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E5=A5=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game-server/app/services/guildService.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/game-server/app/services/guildService.ts b/game-server/app/services/guildService.ts
index df50901fa..a72ef661d 100644
--- a/game-server/app/services/guildService.ts
+++ b/game-server/app/services/guildService.ts
@@ -226,16 +226,17 @@ export async function getUserGuildWithRefActive(roleId: string, select?: string)
     // console.log('####### isRefDaily', isRefDaily, refTimeDaily, now)
     if (isRefDaily) {
         userGuild = await UserGuildModel.resetDailyInfoByRefTimeDaily(roleId, refTimeDaily);
-        if (!userGuild) {
-            userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily');
-            if (!userGuild) return false;
-        };
-        if (refTimeDaily) {
+        if (refTimeDaily && userGuild) {
             await sendUnreceivedWishPool(wishGoods, roleId);
             await sendUnreceivedActiveBox(roleId, guildCode, refTimeDaily, receivedActive);
             await sendUnreceivedDonateBox(roleId, guildCode, refTimeDaily, receiveBoxs);
             await sendUnreceivedBossWar(roleId, refTimeDaily);
         }
+        if (!userGuild) {
+            userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily');
+            if (!userGuild) return false;
+        };
+        
     }
 
     return userGuild;