活动:30天任务减少查询

This commit is contained in:
luying
2022-05-21 20:13:44 +08:00
parent 48a87b3023
commit f4a27f9a6e
4 changed files with 15 additions and 44 deletions

View File

@@ -1,7 +1,7 @@
import { Application, BackendSession, HandlerService, } from 'pinus';
import { resResult } from '../../../pubUtils/util';
import { STATUS, ACTIVITY_TYPE, ITEM_CHANGE_REASON } from '../../../consts';
import { getPlayerThirtyDaysData, playerThirtyDaysActivityDays } from '../../../services/activity/thirtyDaysService';
import { getPlayerThirtyDaysData } from '../../../services/activity/thirtyDaysService';
import { ThirtyDaysData, ThirtyDaysItem, ThirtyDaysPointItem } from '../../../domain/activityField/thirtyDaysField';
import { ActivityThirtyDaysModel } from '../../../db/ActivityThirtyDays';
import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDaysPointReward';
@@ -35,12 +35,10 @@ export class ThirtyDaysHandler {
const roleId = session.get('roleId');
const serverId = session.get('serverId');
let todayIndex = await playerThirtyDaysActivityDays(roleId)
let playerData = await getPlayerThirtyDaysData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_THIRTY_DAYS_END);
return resResult(STATUS.SUCCESS, { playerData, todayIndex });
return resResult(STATUS.SUCCESS, { playerData, todayIndex: playerData.todayIndex });
}
/**
@@ -56,8 +54,6 @@ export class ThirtyDaysHandler {
const sid = session.get('sid');
const roleName = session.get('roleName');
let todayIndex = await playerThirtyDaysActivityDays(roleId);//玩家当前的天数
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
@@ -93,9 +89,9 @@ export class ThirtyDaysHandler {
return resResult(STATUS.ACTIVITY_REWARDED);
}
if (activityDays < todayIndex && todayIndex <= (activityDays + playerData.days)) {//时间正常范围内
if (activityDays < playerData.todayIndex && playerData.todayIndex <= (activityDays + playerData.days)) {//时间正常范围内
} else if (todayIndex > (activityDays + playerData.days)) {//活动已经过期
} else if (playerData.todayIndex > (activityDays + playerData.days)) {//活动已经过期
// console.log('过期奖励')
let expiredItems: Array<ThirtyDaysPointItem> = playerData.needMark();
let cells = expiredItems.map(obj => obj.cellIndex)