🐞 fix(guild): 修复周一加入无活人军团领奖励问题

This commit is contained in:
dingchaolin
2023-03-03 17:02:17 +08:00
parent b66fa43039
commit 968bfc56dc
4 changed files with 39 additions and 10 deletions

View File

@@ -225,9 +225,12 @@ export async function getUserGuildWithRefActive(roleId: string, select?: string)
let isRefDaily = shouldRefresh(refTimeDaily, now);
// console.log('####### isRefDaily', isRefDaily, refTimeDaily, now)
if (isRefDaily) {
userGuild = await UserGuildModel.resetDailyInfo(roleId);
if (!userGuild) return false;
if(refTimeDaily) {
userGuild = await UserGuildModel.resetDailyInfoByRefTimeDaily(roleId, refTimeDaily);
if (!userGuild) {
userGuild = await UserGuildModel.getMyGuild(roleId, select ? select + ' wishGoods +refTimeDaily' : '+refTimeDaily');
if (!userGuild) return false;
};
if (refTimeDaily) {
await sendUnreceivedWishPool(wishGoods, roleId);
await sendUnreceivedActiveBox(roleId, guildCode, refTimeDaily, receivedActive);
await sendUnreceivedDonateBox(roleId, guildCode, refTimeDaily, receiveBoxs);