活动:修改结构

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 { ActivityNewHeroGKModel, ActivityNewHeroGKModelType } from '../../db/ActivityNewHeroGK';
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { NewHeroGKData, NewHeroGKItem } from '../../domain/activityField/newHeroGKField';
@@ -21,7 +22,8 @@ export async function newHeroGKActivity(serverId: number, roleId: string) {
}
let activityData: ActivityModelType = activityDataArray[0];
let playerRecord: ActivityNewHeroGKModelType = await ActivityNewHeroGKModel.findData(serverId, activityData.activityId, roleId);
let playerData = new NewHeroGKData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new NewHeroGKData(activityData, createTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
}
@@ -39,7 +41,8 @@ export async function getPlayerNewHeroGKData(activityId: number, serverId: numbe
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerRecord: ActivityNewHeroGKModelType = await ActivityNewHeroGKModel.findData(serverId, activityId, roleId);
let playerData = new NewHeroGKData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new NewHeroGKData(activityData, createTime);
playerData.setPlayerRecords(playerRecord);
return playerData;
@@ -57,7 +60,8 @@ export async function challengeNewHeroGK(serverId: number, roleId: string, activ
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
let playerRecords = await ActivityNewHeroGKModel.findData(serverId, activityId, roleId);
let records = playerRecords && playerRecords.records ? playerRecords.records : [];
let playerData = new NewHeroGKData(activityData);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new NewHeroGKData(activityData, createTime);
let item = playerData.findItemByGK(pageIndex, gk);
if (item) {
let index = item.index;