活动:修改获取活动逻辑,从serverlist上剥离

This commit is contained in:
luying
2022-04-07 11:38:33 +08:00
parent 0d7b435f1f
commit 765aff9cf0
31 changed files with 148 additions and 152 deletions

View File

@@ -1,11 +1,9 @@
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityNewHeroGKModel, ActivityNewHeroGKModelType } from '../../db/ActivityNewHeroGK';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { NewHeroGKData } from '../../domain/activityField/newHeroGKField';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
import { getActivityById } from './activityService';
import { getActivitiesByType, getActivityById } from './activityService';
/**
@@ -17,8 +15,7 @@ import { getActivityById } from './activityService';
*
*/
export async function newHeroGKActivity(serverId: number, roleId: string) {
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.DAILY_GK, new Date());
let activityDataArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.DAILY_GK);
if (activityDataArray.length === 0) {
return null;
}