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

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

@@ -6,7 +6,7 @@ import { RoleModel } from '../../db/Role';
 import moment = require('moment');
 import { deltaDays } from '../../pubUtils/util';
 import { ServerlistModel } from '../../db/Serverlist';
-import { getActivityById } from './activityService';
+import { getActivitiesByType, getActivityById } from './activityService';
 import { getRoleCreateTime, getServerCreateTime } from '../redisService';
 
 /**
@@ -19,8 +19,7 @@ import { getRoleCreateTime, getServerCreateTime } from '../redisService';
    */
 
 export async function thirtyDaysActivity(type: number, serverId: number, roleId: string) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, type, new Date())
+    let activityArray = await getActivitiesByType(serverId, type);
     if (activityArray.length == 0) {
         return null;
     }