活动：添加活动组

game-server/app/services/growthFundService.ts

@@ -4,6 +4,7 @@ import { ActivityGrowthFundModel, ActivityGrowthFundModelType } from '../db/Acti
 import { ActivityBuyRecordsModel, ActivityBuyRecordsModelType } from '../db/ActivityBuyRecords';
 import { RoleModel } from '../db/Role';
 import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFundField';
+import { ServerlistModel } from '../db/Serverlist';
 
 /**
    * 获取活动数据
@@ -22,7 +23,8 @@ import { GrowthFundData, GrowthFundItem } from '../domain/activityField/growthFu
   GROWTH_FUND_MAIN_ELITE_VIP = 11, // 精英成长基金（高阶）
 */
 export async function growthFundActivity(type: number, serverId: number, roleId: string) {
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, type, new Date())
+    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
+    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, type, new Date())
     if (activityArray.length == 0) {
         return null;
     }