🐞 fix(活动): 30天活动领取时限修改

This commit is contained in:
luying
2022-10-26 17:19:03 +08:00
parent d5d630b765
commit 2970602ac7

View File

@@ -9,8 +9,6 @@ import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ServerlistModel } from '../../../db/Serverlist';
import { addReward, stringToRewardParam } from '../../../services/activity/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
import { getActivitiesByType } from '../../../services/activity/activityService';
import { getRoleCreateTime, getServerCreateTime } from '../../../services/redisService';
export default function (app: Application) {
new HandlerService(app, {});
@@ -53,20 +51,6 @@ export class ThirtyDaysHandler {
const serverId = session.get('serverId');
const sid = session.get('sid');
const roleName = session.get('roleName');
let activityArray = await getActivitiesByType(serverId, ACTIVITY_TYPE.THIRTY_DAYS);
let createTime = await getRoleCreateTime(roleId);
let serverTime = await getServerCreateTime(serverId);
let activityDays = 0;
for (let i = 0; i < activityArray.length; i++) {
let playerData = new ThirtyDaysData(activityArray[i], createTime, serverTime);
if (playerData.activityId != activityId) {
activityDays += playerData.days;//周期天数
} else {
break;
}
}
let playerData = await getPlayerThirtyDaysData(activityId, serverId, roleId)
if (!playerData) return resResult(STATUS.ACTIVITY_MISSING);
@@ -89,9 +73,9 @@ export class ThirtyDaysHandler {
return resResult(STATUS.ACTIVITY_REWARDED);
}
if (activityDays < playerData.todayIndex && playerData.todayIndex <= (activityDays + playerData.days)) {//时间正常范围内
if (0 < playerData.todayIndex && playerData.todayIndex <= playerData.days) {//时间正常范围内
} else if (playerData.todayIndex > (activityDays + playerData.days)) {//活动已经过期
} else if (playerData.todayIndex > playerData.days) {//活动已经过期
// console.log('过期奖励')
let expiredItems: Array<ThirtyDaysPointItem> = playerData.needMark();
let cells = expiredItems.map(obj => obj.cellIndex)