活动：添加活动组

game-server/app/services/popUpShopService.ts

@@ -4,6 +4,7 @@ import { PopUpShopData, } from '../domain/activityField/popUpShopField';
 import { RewardParam } from '../domain/activityField/rewardField';
 import { addReward, stringToRewardParam } from './giftPackageService';
 import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/ActivityPopUpShop';
+import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据
@@ -15,7 +16,8 @@ import { ActivityPopUpShopModel, ActivityPopUpShopModelType } from '../db/Activi
    */
 
 export async function popUpShopActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.POP_UP_SHOP, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });