军团：权限判断函数提取

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

@@ -15,6 +15,7 @@ import { handleCost } from "../../../services/rewardService";
 import { addActive } from "../../../services/guildService";
 import { Rank } from "../../../services/rankService";
 import { checkActivityTask, checkTask } from "../../../services/taskService";
+import { guildInter } from "../../../pubUtils/interface";
 
 export default function (app: Application) {
     new HandlerService(app, {});
@@ -134,8 +135,8 @@ export class CityActivityHandler {
     }
 
     // 开始挑战
-    async checkBattle(msg: { cityId: number, costGold: boolean, heroes: number[] }, session: BackendSession) {
-        let { cityId, costGold, heroes } = msg;
+    async checkBattle(msg: guildInter & { cityId: number, costGold: boolean, heroes: number[] }, session: BackendSession) {
+        let { cityId, costGold, heroes, myUserGuild: userGuild } = msg;
         if (!heroes || heroes.length <= 0) return resResult(STATUS.WRONG_PARMS);
 
         const roleId = session.get('roleId');
@@ -161,8 +162,6 @@ export class CityActivityHandler {
         // 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);