活动：修改获取活动逻辑，从serverlist上剥离

game-server/app/services/gmService.ts

@@ -29,6 +29,7 @@ import { RefreshShopData } from "../domain/activityField/refreshShopField";
 import { RoleType } from "../db/Role";
 import { MonopolyData } from "../domain/activityField/monopolyField";
 import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from "../db/ActivityPopUpShop";
+import { getActivitiesByType } from "./activity/activityService";
 
 // —————————————— 跑马灯 —————————————— //
 // 初始
@@ -319,8 +320,7 @@ export async function getParamStr(activity: ActivityModelType, productID: string
             // param['beginTimeStamp'] = playerRecord.beginTime.getTime();
             break;
         case ACTIVITY_TYPE.REFRESH_SHOP:
-            let { activityGroupId } = await ServerlistModel.findByServerId(role.serverId);
-            let monopolyActivitys = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.MONOPOLY, 1);
+            let monopolyActivitys = await getActivitiesByType(role.serverId, ACTIVITY_TYPE.MONOPOLY);
             let parentActivity = monopolyActivitys.find(activity => {
                 let data = new MonopolyData(activity, 0, 0);
                 let curShop = data.list.find(land => { // 找到关联活动