活动:时间
This commit is contained in:
@@ -5,6 +5,7 @@ import { ActivitySignInModel, ActivitySignInModelType } from '../../db/ActivityS
|
||||
import { RoleModel } from '../../db/Role';
|
||||
import { ServerlistModel } from '../../db/Serverlist';
|
||||
import { SignInData } from '../../domain/activityField/signInField';
|
||||
import { getRoleCreateTime, getServerCreateTime } from '../redisService';
|
||||
import { getActivityById } from './activityService';
|
||||
|
||||
/**
|
||||
@@ -23,8 +24,9 @@ export async function signInActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SignInData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new SignInData(activityData, createTime, serverTime);
|
||||
let curDate = moment(new Date()).valueOf();
|
||||
if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启
|
||||
return null;
|
||||
@@ -50,8 +52,9 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SignInData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new SignInData(activityData, createTime, serverTime);
|
||||
|
||||
let curDate = moment(new Date()).valueOf();
|
||||
if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启
|
||||
@@ -80,8 +83,9 @@ export async function newPlayerSignInActivity(serverId: number, roleId: string)
|
||||
return null;
|
||||
}
|
||||
let activityData = activityArray[0];
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SignInData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new SignInData(activityData, createTime, serverTime);
|
||||
|
||||
let betinTime = null;
|
||||
let endTime = null
|
||||
@@ -122,8 +126,10 @@ export async function getPlayerSignInData(activityId: number, serverId: number,
|
||||
&& activityData.type !== ACTIVITY_TYPE.COMMON_SIGN_IN) {
|
||||
return null;
|
||||
}
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SignInData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
|
||||
let playerData = new SignInData(activityData, createTime, serverTime);
|
||||
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityId, roleId, playerData.roundIndex);
|
||||
|
||||
playerData.setPlayerRecords(playerRecords);
|
||||
@@ -159,8 +165,9 @@ export async function makeSignInVIP(roleId: string, roleName: string, sid: strin
|
||||
if (activityData.type !== ACTIVITY_TYPE.SIGN_IN_VIP) {
|
||||
return STATUS.ACTIVITY_TYPE_ERROR;
|
||||
}
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let playerData = new SignInData(activityData, createTime);
|
||||
let createTime = await getRoleCreateTime(roleId);
|
||||
let serverTime = await getServerCreateTime(serverId);
|
||||
let playerData = new SignInData(activityData, createTime, serverTime);
|
||||
|
||||
await ActivitySignInModel.buyVIP(activityId, roleId, playerData.roundIndex);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user