xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

活动：修改老接口

Browse Source
This commit is contained in:
qiaoxin
2021-05-31 14:40:09 +08:00
parent cb7c930d46
commit 45126d296f
3 changed files with 53 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
game-server/app/servers/activity/handler/thirtyDaysHandler.ts
View File

@@ -9,6 +9,8 @@ import { ActivityThirtyDaysPointRewardModel } from '../../../db/ActivityThirtyDa
import moment = require('moment');
import { ActivityModel, ActivityModelType } from '../../../db/Activity';
import { ServerlistModel } from '../../../db/Serverlist';
import { addReward, stringToRewardParam } from '../../../services/giftPackageService';
import { RewardParam } from '../../../domain/activityField/rewardField';
export default function (app: Application) {
return new ThirtyDaysHandler(app);
@@ -94,17 +96,15 @@ export class ThirtyDaysHandler {
}
await ActivityThirtyDaysModel.addRecord(serverId, activityId, roleId, pageIndex, cellIndex);
let reward = thirtyDaysItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = thirtyDaysItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
}
return resResult(STATUS.SUCCESS, { goods, addHeros });
let rewardParamArr: Array<RewardParam> = stringToRewardParam(thirtyDaysItemData.reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
thirtyDaysItemData.isReceive = true;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, pageIndex, cellIndex },
item: thirtyDaysItemData,
}));
}
/**
@@ -136,16 +136,19 @@ export class ThirtyDaysHandler {
}
await ActivityThirtyDaysPointRewardModel.addRecord(activityId, roleId, cellIndex);
let reward = thirtyDaysPointItemData.goodReward();
let goods = await addItems(roleId, roleName, sid, reward);
let heroReward = thirtyDaysPointItemData.heroReward();
let addHeros = [];
if (heroReward.length > 0) {
let heroResult = await createHeroes(roleId, roleName, sid, serverId, funcs, heroReward);
goods = goods.concat(heroResult.goods)
addHeros = addHeros.concat(heroResult.heroes);
let reward = thirtyDaysPointItemData.reward
if (thirtyDaysPointItemData.isExpired && thirtyDaysPointItemData.expiredReward && thirtyDaysPointItemData.expiredReward != '') {//过期奖励
reward = thirtyDaysPointItemData.expiredReward;
}
return resResult(STATUS.SUCCESS, { goods, addHeros });
let rewardParamArr: Array<RewardParam> = stringToRewardParam(reward);
let result = await addReward(roleId, roleName, sid, serverId, funcs, rewardParamArr)
thirtyDaysPointItemData.isReceive = true;
return resResult(STATUS.SUCCESS, Object.assign(result, {
param: { activityId, cellIndex },
item: thirtyDaysPointItemData,
}));
}
}