活动:时间

This commit is contained in:
陆莹
2022-03-23 13:54:04 +08:00
parent 29c5ae8a0a
commit 7bb8250060
70 changed files with 456 additions and 342 deletions
@@ -5,6 +5,7 @@ import { ActivityMonopolyLandModel, ActivityMonopolyLandModelType } from '../../
import { RoleModel } from '../../db/Role';
import { ServerlistModel } from '../../db/Serverlist';
import { MonopolyData } from '../../domain/activityField/monopolyField';
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
import { getActivityById } from './activityService';
@@ -25,8 +26,10 @@ export async function getMonopolyActivity(serverId: number, roleId: string) {
let activityData: ActivityModelType = activityDataArray[0];
let playerMonopolyData: ActivityMonopolyModelType = await ActivityMonopolyModel.findData(serverId, activityData.activityId, roleId);
let playerLandData: ActivityMonopolyLandModelType[] = await ActivityMonopolyLandModel.findData(serverId, activityData.activityId, roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new MonopolyData(activityData, createTime);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new MonopolyData(activityData, createTime, serverTime);
playerData.setPlayerRecords(playerMonopolyData, playerLandData);
return playerData;
}
@@ -47,8 +50,9 @@ export async function getPlayerMonopolyData(activityId: number, serverId: number
}
let playerMonopolyData: ActivityMonopolyModelType = await ActivityMonopolyModel.findData(serverId, activityData.activityId, roleId);
let playerLandData: ActivityMonopolyLandModelType[] = await ActivityMonopolyLandModel.findData(serverId, activityData.activityId, roleId);
let { createTime } = await RoleModel.findByRoleId(roleId);
let playerData = new MonopolyData(activityData, createTime);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let playerData = new MonopolyData(activityData, createTime, serverTime);
playerData.setPlayerRecords(playerMonopolyData, playerLandData);
return playerData;
}