活动：添加活动组

game-server/app/services/rechargeMoneyService.ts

@@ -6,6 +6,7 @@ import { RechargeMoneyData, RechargeMoneyItem } from '../domain/activityField/re
 import { addReward, stringToRewardParam } from './giftPackageService';
 
 import moment = require('moment');
+import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据
@@ -17,7 +18,8 @@ import moment = require('moment');
    */
 
 export async function rechargeMoneyActivity(serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.RECHARGE_MONEY, new Date())
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });