From 767df7ae44da98761f50f125e778b70d73ffba8d Mon Sep 17 00:00:00 2001 From: luying Date: Tue, 24 Aug 2021 18:01:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=9B=E5=9B=A2=EF=BC=9A=E6=8E=A5=E5=8F=97?= =?UTF-8?q?=E5=B7=B2=E8=A7=A3=E6=95=A3=E7=9A=84=E5=86=9B=E5=9B=A2=E9=82=80?= =?UTF-8?q?=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game-server/app/servers/guild/handler/guildHandler.ts | 4 ++++ shared/consts/statusCode.ts | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/game-server/app/servers/guild/handler/guildHandler.ts b/game-server/app/servers/guild/handler/guildHandler.ts index 572ad2da4..69a8e196a 100644 --- a/game-server/app/servers/guild/handler/guildHandler.ts +++ b/game-server/app/servers/guild/handler/guildHandler.ts @@ -448,6 +448,10 @@ export class GuildHandler { if (isReceived) { // 同意申请，加入 const { guildCode } = invite; const guild = await GuildModel.findByCode(guildCode, serverId); + if (!guild) { + await UserGuildApplyModel.deleteByApplyCode([applyCode]); // 删除这条邀请 + return resResult(STATUS.GUILD_DELETE_ERROR); + } const joinResult = await joinGuild(guildCode, guild.name, guild.lv, roleId, serverId, session); if (joinResult.status == -1) { diff --git a/shared/consts/statusCode.ts b/shared/consts/statusCode.ts index 06e2b6474..6eb179cfd 100644 --- a/shared/consts/statusCode.ts +++ b/shared/consts/statusCode.ts @@ -149,7 +149,7 @@ export const STATUS = { GUILD_NOT_REACH_CONDI: { code: 20903, simStr: '您未达到申请军团条件' }, GUILD_HAS_JOIN: { code: 20904, simStr: '已加入过其他军团' }, GUILD_NOT_FOUND: { code: 20905, simStr: '未获取到该军团' }, - GUILD_DELETE_ERROR: { code: 20906, simStr: '公会已解散' }, + GUILD_DELETE_ERROR: { code: 20906, simStr: '军团已解散' }, GUILD_QUIT_ERROR: { code: 20907, simStr: '退出公会失败' }, GUILD_KICK_ERROR: { code: 20908, simStr: '未找到该成员或该成员已退出' }, GUILD_QUIT_TIME: { code: 20909, simStr: '退出军团1小时后才可以申请' },