活动:添加活动组
This commit is contained in:
@@ -2,6 +2,7 @@ import moment = require('moment');
|
||||
import { ACTIVITY_TYPE, SERVER_OPEN_TIME, SIGNIN_CLOSE, SIGNIN_OPEN, SIGNIN_VIP_OPEN_LIMIT } from '../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../db/Activity';
|
||||
import { ActivitySignInModel, ActivitySignInModelType } from '../db/ActivitySignIn';
|
||||
import { ServerlistModel } from '../db/Serverlist';
|
||||
import { SignInData, SignInItem } from '../domain/activityField/signInField';
|
||||
|
||||
/**
|
||||
@@ -19,7 +20,8 @@ export async function signInActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SIGN_IN, new Date());
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN, new Date());
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
@@ -45,7 +47,8 @@ export async function signInVIPActivity(serverId: number, roleId: string) {
|
||||
return null;
|
||||
}
|
||||
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.SIGN_IN_VIP, new Date());
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(activityGroupId, ACTIVITY_TYPE.SIGN_IN_VIP, new Date());
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user