活动：活动按照合集调整数据结构

game-server/app/servers/activity/handler/activityHandler.ts

@@ -1,6 +1,6 @@
 import { Application, BackendSession } from 'pinus';
 import { resResult } from '../../../pubUtils/util';
-import { ACTIVITY_TYPE, FIRST_GIFT_STATE, SERVER_OPEN_TIME, STATUS, TASK_TYPE } from '../../../consts';
+import { ACTIVITY_TYPE, ACTIVITY_GROUP_TYPE, SERVER_OPEN_TIME, STATUS, TASK_TYPE } from '../../../consts';
 import { firstGiftActivity, getPlayerFirstGiftData } from '../../../services/firstGiftService';
 import { newPlayerSignInActivity, signInActivity, signInVIPActivity } from '../../../services/signInService';
 import { growthFundActivity } from '../../../services/growthFundService';
@@ -24,6 +24,10 @@ import { getSelfServiceShopActivityData } from '../../../services/selfServiceSho
 import { ActivitySelfServiceGoodsModel } from '../../../db/ActivitySelfServiceGoods';
 import { dailyMealActivity } from '../../../services/dailyMealService';
 import { dailyCoinActivity } from '../../../services/dailyCoinService';
+import { ActivityGroupModel } from '../../../db/ActivityGroup';
+import { ServerlistModel } from '../../../db/Serverlist';
+import { getActivity } from '../../../services/activityService';
+import { ActivityModel } from '../../../db/Activity';
 // import { ActivityDailyChallengesModel } from '../../../db/ActivityDailyChallenges';
 // import { isComplete } from '../../../pubUtils/taskUtil';
 
@@ -466,7 +470,27 @@ export class ActivityHandler {
             }
         }
 
-        return resResult(STATUS.SUCCESS, { playerActivityArray });
+        let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+        let groups = await ActivityGroupModel.findGroupsData(activityGroupId);
+        let playerGroupArray = [];
+        for (let groupData of groups) {
+            if (groupData.type !== ACTIVITY_GROUP_TYPE.UNKNOW) {
+                let playerActivityArray = [];
+                for (let activityId of groupData.activities) {
+                    let activityData = await ActivityModel.findActivity(activityId);
+                    if (activityData) {
+                        let playerActivityData = await getActivity(serverId, roleId, activityId, activityData.type)
+                        if (playerActivityData) playerActivityArray.push(playerActivityData);
+                    }
+                }
+                playerGroupArray.push({
+                    type: groupData.type,
+                    activities: playerActivityArray,
+                });
+            }
+        }
+
+        return resResult(STATUS.SUCCESS, { playerActivityArray, playerGroupArray });
     }
 
     //测试活动任务数据