xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐞 fix(军团): 军团补发邮件有可能因为并发发出多封

Browse Source
This commit is contained in:
luying
2022-11-08 17:35:33 +08:00
parent 4e205b47bb
commit f92d1336ac
6 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
game-server/app/servers/guild/handler/guildHandler.ts
View File

@@ -2,7 +2,7 @@ import { Application, BackendSession, ChannelService, HandlerService, } from 'pi
import { resResult, getRandEelm, shouldRefresh, sortArrRandom } from '../../../pubUtils/util';
import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_SELECT, USER_GUILD_SELECT, TASK_TYPE, DEBUG_MAGIC_WORD, CHANNEL_PREFIX, MSG_TYPE, MSG_SOURCE, ITEM_CHANGE_REASON, TA_EVENT, GUILD_DISMISS_WAY, GUILD_MASTER_CHANGE_WAY, GUILD_QUIT_WAY, PUSH_ROUTE } from '../../../consts';
import { UserGuildModel, UserGuildType } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, refreshUserGuild, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate, getTodayGuildActive } from '../../../services/guildService';
import { checkAuth, joinGuild, getUserGuildWithRefActive, addActive, settleGuildWeekly, getMyGuildInfo, setUserGuildSession, getInvitationList, addGuildRecord, pushChangeGuildLeader, pushGuildMemberQuit, pushGuildDismiss, pushGuildInfoUpdate, getTodayGuildActive } from '../../../services/guildService';
import { GuildModel, GuildType, GuildUpdateParam } from '../../../db/Guild';
import { RoleModel, RoleType } from '../../../db/Role';
import { ARMY } from '../../../pubUtils/dicParam';
@@ -269,8 +269,7 @@ export class GuildHandler {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
const sid = session.get('sid');
const { myUserGuild } = msg;
let userGuild = await refreshUserGuild(myUserGuild, roleId);
let userGuild = await getUserGuildWithRefActive(roleId);
if (!userGuild) {
return resResult(STATUS.SUCCESS, { hasGuild: false })
};
@@ -845,9 +844,9 @@ export class GuildHandler {
const sid = session.get('sid');
const serverId = session.get('serverId');
const { code, id, myUserGuild } = msg;
const { code, id } = msg;
let userGuild = await refreshUserGuild(myUserGuild, roleId);
let userGuild = await getUserGuildWithRefActive(roleId);
if (!userGuild) return resResult(STATUS.GUILD_NOT_FOUND);
let activeDayReward = gameData.guildActiveDayReward.get(id);