军团活动：蛮夷入侵定时任务及推送

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

@@ -1,5 +1,5 @@
 import { Application, BackendSession, ChannelService } from "pinus";
-import { setMedianCe, getMedianCe, getGuildActivityStatus, getRecordScore, getGuildActivityObj } from "../../../services/guildActivityService";
+import { setMedianCe, getMedianCe, getGuildActivityStatus, getRecordScore, getGuildActivityObj, getGuildActivityRank } from "../../../services/guildActivityService";
 import { resResult } from "../../../pubUtils/util";
 import { STATUS, GUILD_ACTIVITY_TYPE, GUILD_POINT_WAYS, ENEMIES_TYPE, GET_POINT_WAYS } from "../../../consts";
 import { GameModel } from "../../../db/Game";
@@ -45,33 +45,13 @@ export class GateActivityHandler {
         let myGuildActivityRec = await UserGuildActivityRecModel.getRecord(roleId, roleName, guildCode, serverId, sourceCode, [], this.aid);
         let { challengeCnt } = myGuildActivityRec; 
 
-        // TODO 处理多余字段
-        let {ranks: guildRank, myRank: myGuildRank} = await getUnionRank(REDIS_KEY.GUILD_ACTIVITY, serverId, guildCode, 10);
-        let {ranks: memberRank, myRank: myMemberRank} = await getRank(getGuildKeyName(REDIS_KEY.USER_GUILD_ACTIVITY, guildCode), serverId, roleId);
-        if(!myGuildRank) {
-            let guild = await GuildModel.findByCode(guildCode, serverId, 'name');
-            myGuildRank = {
-                rank: 0,
-                code: guildCode,
-                name: guild.name,
-                num: 0
-            }
-        }
-        if(!myMemberRank) {
-            myMemberRank = {
-                rank: 0,
-                roleId,
-                roleName,
-                num: 0
-            }
-        }
+        let ranks = await getGuildActivityRank(guildCode, serverId, roleId, roleName);
 
         return resResult(STATUS.SUCCESS, {
             ...statusResult,
             challengeCnt: GUILDACTIVITY.GATEACTIVITY_CHALLENGE_TIMES - challengeCnt,
-            guildRank, myGuildRank,
-            memberRank, myMemberRank
-        })
+            ...ranks
+        });
     }
 
     // 开启挑战
@@ -101,7 +81,7 @@ export class GateActivityHandler {
         let { code, challengeCnt } = myGuildActivityRec; 
 
         // 更新公会参与的玩家
-        getGuildActivityObj(this.aid).pushMembers(guildCode, roleId);
+        getGuildActivityObj(this.aid).pushMembers(guildCode, serverId, roleId);
 
         // 返回当前军团总军功
         let guildScore = await getRankScore(REDIS_KEY.GUILD_ACTIVITY, serverId, guildCode);