活动:签到bug
This commit is contained in:
@@ -4,7 +4,7 @@ import { ActivityModel, ActivityModelType } from '../db/Activity';
|
||||
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
|
||||
import { RoleModel } from '../db/Role';
|
||||
import { ServerlistModel } from '../db/Serverlist';
|
||||
import { SignInData, SignInItem } from '../domain/activityField/signInField';
|
||||
import { SignInData } from '../domain/activityField/signInField';
|
||||
|
||||
/**
|
||||
* 获取活动数据
|
||||
@@ -24,7 +24,7 @@ export async function signInActivity(serverId: number, roleId: string) {
|
||||
let activityData = activityArray[0];
|
||||
let playerData = new SignInData(activityData);
|
||||
let curDate = moment(new Date()).valueOf();
|
||||
if (curDate < playerData.beginTime || curDate > playerData.beginTime) {//未开启
|
||||
if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启
|
||||
return null;
|
||||
}
|
||||
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
|
||||
@@ -51,7 +51,7 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
|
||||
let playerData = new SignInData(activityData);
|
||||
|
||||
let curDate = moment(new Date()).valueOf();
|
||||
if (curDate < playerData.beginTime || curDate > playerData.beginTime) {//未开启
|
||||
if (curDate < playerData.beginTime || curDate > playerData.endTime) {//未开启
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
|
||||
*/
|
||||
export async function newPlayerSignInActivity(serverId: number, roleId: string) {
|
||||
let { createTime } = await RoleModel.findByRoleId(roleId);
|
||||
let betinTime = moment(createTime).startOf('d').toDate();
|
||||
let betinTime = moment(createTime * 1000).startOf('d').toDate();
|
||||
let endTime = moment(betinTime).add(NEW_PLAYER_SIGIN_DAYS - 1, 'd').endOf('d').toDate()
|
||||
let curDate = new Date()
|
||||
if (curDate > endTime) {
|
||||
@@ -80,6 +80,7 @@ export async function newPlayerSignInActivity(serverId: number, roleId: string)
|
||||
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.NEW_PLAYER_SIGN_IN, new Date());
|
||||
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -87,7 +88,7 @@ export async function newPlayerSignInActivity(serverId: number, roleId: string)
|
||||
let playerData = new SignInData(activityData);
|
||||
playerData.setNewPlayerDate(betinTime, endTime);
|
||||
let curDateStamp = moment(new Date()).valueOf();
|
||||
if (curDateStamp < playerData.beginTime || curDateStamp > playerData.beginTime) {//未开启
|
||||
if (curDateStamp < playerData.beginTime || curDateStamp > playerData.endTime) {//未开启
|
||||
return null;
|
||||
}
|
||||
let playerRecords: ActivitySignInModelType = await ActivitySignInModel.findData(activityData.activityId, roleId, playerData.roundIndex);
|
||||
|
||||
Reference in New Issue
Block a user