✨ feat(gvg): 准备期：千机阁以及获取物品

2023-02-17 10:58:05 +08:00
parent 0530f931bc
commit 098a7c85c6
28 changed files with 744 additions and 106 deletions
@@ -211,8 +211,6 @@ export class GVGManageHandler {
            let data = new LeagueGuildInfo(guild, serverNames);
            let hasInvited = !!invitations.find(cur => cur.guildCode == guild.code);
            data.setHasInvited(hasInvited);
-            // TODO
-            // data.setActive
            return data
        });

@@ -319,10 +317,23 @@ export class GVGManageHandler {
        const league = await GVGLeagueModel.findByCode(targetLeagueCode);
        if(!league) return resResult(STATUS.GVG_LEAGUE_NOT_EXIST);

+        let { configId } = getGVGPeriodData();
        const guilds = await GuildModel.findByCodes(league.guildCodes);
+        const members = league.members||[];
+        let roleIds = members.map(member => member.roleId);
        const serverNames = await getAllServerName();
+        const userdatas = await GVGUserDataModel.findByRoles(configId, targetLeagueCode, roleIds);
        const result = guilds.map(guild => {
-            return new LeagueGuildInfo(guild, serverNames)
+            let obj = new LeagueGuildInfo(guild, serverNames);
+            let active = userdatas.reduce((pre, userdata) => {
+                let member = members.find(cur => cur.roleId == userdata.roleId);
+                if(member && member.guildCode == guild.code) {
+                    return pre + userdata.active;
+                }
+                return pre;
+            }, 0);
+            obj.setActive(active);
+            return obj;
        });

        // 返回