军团：权限判断函数提取

game-server/app/servers/guild/handler/gateActivityHandler.ts

@@ -15,6 +15,7 @@ import { GuildActivityCityModel } from "../../../db/GuildActivityCity";
 import { Rank } from "../../../services/rankService";
 import { getTimeFun } from "../../../pubUtils/timeUtil";
 import { checkActivityTask, checkTask } from "../../../services/taskService";
+import { guildInter } from "../../../pubUtils/interface";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -61,8 +62,8 @@ export class GateActivityHandler {
     }
 
     // 开启挑战
-    async checkBattle(msg: { heroes: number[] }, session: BackendSession) {
-        let { heroes } = msg;
+    async checkBattle(msg: guildInter & { heroes: number[] }, session: BackendSession) {
+        let { heroes, myUserGuild: userGuild } = msg;
         if (!heroes || heroes.length <= 0) return resResult(STATUS.WRONG_PARMS);
 
         const roleId = session.get('roleId');
@@ -80,8 +81,6 @@ export class GateActivityHandler {
         // TODO 测试完成后去掉这条判断
         // if(!statusResult.isOpen) return resResult(STATUS.GUILD_ACTIVITY_NOT_OPEN);
 
-        let userGuild = await UserGuildModel.getMyGuild(roleId, 'job');
-
         let guildActivityRec = await GuildActivityRecordModel.getRecord(guildCode, serverId, this.aid);
         if (!guildActivityRec) return resResult(STATUS.INTERNAL_ERR);