活动:修改活动bug

This commit is contained in:
qiaoxin
2021-05-26 16:09:13 +08:00
parent b9c6f5541c
commit 064b3258fe
32 changed files with 162 additions and 61 deletions

View File

@@ -1,8 +1,31 @@
import { ACTIVITY_TYPE } from '../consts';
import { ActivityModel, ActivityModelType } from '../db/Activity';
import { ActivityDailyGiftsModel, ActivityDailyGiftsModelType } from '../db/ActivityDailyGifts';
import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGiftsField';
/**
* 获取活动数据
*
* @param {number} serverId 区Id
* @param {number} activityId 活动Id
* @param {string} roleId 角色Id
*
*/
export async function dailyGiftsActivity(serverId: number, roleId: string) {
let activityDataArray: ActivityModelType[] = await ActivityModel.findOpenActivityByType(serverId, ACTIVITY_TYPE.DAILY_DISCOUNT_GIFT, new Date());
if (activityDataArray.length === 0) {
return null;
}
let activityData: ActivityModelType = activityDataArray[0];
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityData.activityId, roleId);
let playerData = new DailyGiftsData(activityData);
playerData.setPlayerRecords(playerRecords);
return playerData;
}
/**
* 玩家玩家活动数据
*
@@ -12,7 +35,7 @@ import { DailyGiftsData, DailyGiftItem } from '../domain/activityField/dailyGift
*
*/
export async function getPlayerDailyGiftsData(activityId: number, serverId: number, roleId: string) {
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId, true);
let activityData: ActivityModelType = await ActivityModel.findActivity(serverId, activityId);
let playerRecords: ActivityDailyGiftsModelType[] = await ActivityDailyGiftsModel.findData(serverId, activityId, roleId);
let playerData = new DailyGiftsData(activityData);