活动：添加活动组

game-server/app/services/orderService.ts

@@ -11,6 +11,7 @@ import { makeDailyRMBGiftsReward } from './dailyRMBGiftsService';
 import { makePopUpShopReward } from './popUpShopService';
 import { ActivityModel, ActivityModelType } from '../db/Activity';
 import { ActivityFirstGiftModel } from '../db/ActivityFirstGift';
+import { ServerlistModel } from '../db/Serverlist';
 
 
 
@@ -41,7 +42,8 @@ export async function makeOrder(localOrderID: string, sid: string, orderInfo: Us
 
     //首冲礼包
     {
-        let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(orderInfo.serverId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
+        let { activityGroupId } = await ServerlistModel.findByServerId(orderInfo.serverId);
+        let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, new Date())
         for (let obj of activityArray) {
             await ActivityFirstGiftModel.begin(obj.activityId, roleId);
         }