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;