活动:删除serverId相关查询
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
import { ACTIVITY_TYPE, TASK_TYPE } from '../consts';
|
||||
import { ActivityModel, ActivityModelType } from '../db/Activity';
|
||||
import { ActivityFirstGiftModel, ActivityFirstGiftModelType } from '../db/ActivityFirstGift';
|
||||
import { ServerlistModel } from '../db/Serverlist';
|
||||
import { FirstGiftData } from '../domain/activityField/firstGiftField';
|
||||
|
||||
/**
|
||||
@@ -13,7 +14,8 @@ import { FirstGiftData } from '../domain/activityField/firstGiftField';
|
||||
*/
|
||||
|
||||
export async function firstGiftActivity(serverId: number, roleId: string) {
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(serverId, ACTIVITY_TYPE.FIRST_GIFT, 1)
|
||||
let { activityGroupId } = await ServerlistModel.findByServerId(serverId);
|
||||
let activityArray: ActivityModelType[] = await ActivityModel.findActivityByType(activityGroupId, ACTIVITY_TYPE.FIRST_GIFT, 1)
|
||||
|
||||
if (activityArray.length == 0) {
|
||||
return null;
|
||||
@@ -38,7 +40,7 @@ export async function firstGiftActivity(serverId: number, roleId: string) {
|
||||
*
|
||||
*/
|
||||
export async function getPlayerFirstGiftData(activityId: number, serverId: number, roleId: string) {
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
|
||||
let activityData: ActivityModelType = await ActivityModel.findActivity(activityId);
|
||||
let playerRecord: ActivityFirstGiftModelType = await ActivityFirstGiftModel.findData(activityId, roleId);
|
||||
|
||||
let playerData = new FirstGiftData(activityData);
|
||||
|
||||
Reference in New Issue
Block a user