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

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

@@ -8,7 +8,7 @@ import moment = require('moment');
 import { ServerlistModel } from '../../db/Serverlist';
 import { sendMailByContent } from './../mailService';
 import { RoleModel, RoleType } from '../../db/Role';
-import { getActivityById } from './activityService';
+import { getActivitiesByType, getActivityById } from './activityService';
 import { RewardInter } from '../../pubUtils/interface';
 import { DUNGEON_CONST, PVP, VIP } from '../../pubUtils/dicParam';
 import { cal } from '../../pubUtils/util';
@@ -26,8 +26,7 @@ import { getRoleCreateTime, getServerCreateTime } from '../redisService';
    */
 
 export async function monthlyTicketActivity(serverId: number, roleId: string, type: number) {
-    let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
-    let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, type, new Date())
+    let activityArray = await getActivitiesByType(serverId, type);
     activityArray = activityArray.sort((a, b) => {
         return b.activityId - a.activityId
     });