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

game-server/app/services/activity/growthService.ts

@@ -3,11 +3,9 @@ import { ActivityModel, ActivityModelType } from '../../db/Activity';
 import { ActivityGrowthModel, ActivityGrowthModelType } from '../../db/ActivityGrowth';
 import { ActivityGrowthPointModel, ActivityGrowthPointModelType } from '../../db/ActivityGrowthPoint';
 import { HeroModel } from '../../db/Hero';
-import { RoleModel } from '../../db/Role';
-import { ServerlistModel } from '../../db/Serverlist';
 import { GrowthData } from '../../domain/activityField/growthField';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
-import { getActivityById } from './activityService';
+import { getActivitiesByType, getActivityById } from './activityService';
 
 /**
    * 获取活动数据
@@ -18,8 +16,7 @@ import { getActivityById } from './activityService';
    *
    */
 export async function growthActivity(serverId: number, roleId: string) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.TASK_GROWTH, new Date());
+    let activityDataArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.TASK_GROWTH);
     if (activityDataArray.length === 0) {
         return null;
     }