活动:时间
This commit is contained in:
@@ -4,6 +4,7 @@ import { ActivityDailyMealModel, ActivityDailyMealModelType } from '../../db/Act
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { DailyMealData } from '../../domain/activityField/dailyMealField';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
import { getActivityById } from './activityService';
|
||||
|
||||
|
||||
@@ -22,8 +23,9 @@ export async function dailyMealActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
let activityData: ActivityModelType = activityDataArray[0];
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new DailyMealData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new DailyMealData(activityData, createTime, serverTime);
|
||||
|
||||
let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.roundIndex);
|
||||
let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.roundIndex);
|
||||
@@ -42,8 +44,9 @@ export async function dailyMealActivity(serverId: number, roleId: string) {
|
||||
*/
|
||||
export async function getPlayerDailyMealData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData = await getActivityById(activityId);
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new DailyMealData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new DailyMealData(activityData, createTime, serverTime);
|
||||
|
||||
let playerLunchRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.LUNCH, playerData.roundIndex);
|
||||
let playerDinnerRecords: ActivityDailyMealModelType[] = await ActivityDailyMealModel.findData(serverId, activityData.activityId, roleId, DAILY_MEAL_TYPE.DINNER, playerData.roundIndex);
|
||||
|
||||
Reference in New Issue
Block a user