活动:修改结构

This commit is contained in:
qiaoxin
2021-06-30 11:41:38 +08:00
parent 550ec29842
commit 3cff8acf3a
60 changed files with 260 additions and 169 deletions
@@ -1,6 +1,7 @@
import { ACTIVITY_TYPE } from '../../consts';
import { ActivityModel, ActivityModelType } from '../../db/Activity';
import { ActivityDailyChallengesModel, ActivityDailyChallengesModelType } from '../../db/ActivityDailyChallenges';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { DailyChallengesData, DailyItem } from '../../domain/activityField/dailyChallengesField';
@@ -21,7 +22,8 @@ export async function dailyChallengesActivity(serverId: number, roleId: string)
}
let activityData: ActivityModelType = activityDataArray[0];
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityData.activityId, roleId);
let playerData = new DailyChallengesData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyChallengesData(activityData, createTime);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
@@ -38,8 +40,8 @@ export async function dailyChallengesActivity(serverId: number, roleId: string)
export async function getPlayerDailyChallengesData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerRecords: ActivityDailyChallengesModelType[] = await ActivityDailyChallengesModel.findData(serverId, activityId, roleId);
let playerData = new DailyChallengesData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new DailyChallengesData(activityData, createTime);
playerData.setPlayerRecords(playerRecords);
return playerData;