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

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

@@ -5,7 +5,7 @@ import { RoleModel } from '../../db/Role';
 import { ServerlistModel } from '../../db/Serverlist';
 import { DailyChallengesData } from '../../domain/activityField/dailyChallengesField';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
-import { getActivityById } from './activityService';
+import { getActivitiesByType, getActivityById } from './activityService';
 
 
 /**
@@ -17,8 +17,8 @@ import { getActivityById } from './activityService';
    *
    */
 export async function dailyChallengesActivity(serverId: number, roleId: string) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.TASK_DAILY_CHALLENGES, new Date());
+
+    let activityDataArray: ActivityModelType[] = await getActivitiesByType(serverId, ACTIVITY_TYPE.TASK_DAILY_CHALLENGES);
     if (activityDataArray.length === 0) {
         return null;
     }