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

军团：添加补发捐献宝箱

Browse Source
This commit is contained in:
luying
2022-05-12 18:44:17 +08:00
parent eca5ec1733
commit 861ef65e34
6 changed files with 61 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
game-server/app/servers/guild/handler/donateHandler.ts
View File

@@ -8,7 +8,7 @@ import { getArmyDonateBaseByLv, getArmyDonateBoxBaseById } from '../../../pubUti
import { GuildModel } from '../../../db/Guild';
import { handleCost, addItems } from '../../../services/role/rewardService';
import { CHAT_SERVER, GUILD_POINT_WAYS } from '../../../consts';
import { addFund, getDonation } from '../../../services/donateService';
import { addFund, donate, getDonation } from '../../../services/donateService';
import { getUserGuildWithRefActive, refreshUserGuild } from '../../../services/guildService';
import { ARMY } from '../../../pubUtils/dicParam';
import { addActive } from '../../../services/guildService'
@@ -44,7 +44,7 @@ export class DonationHandler {
return resResult(STATUS.WRONG_PARMS);
}
const { guildCode: code, donateCnt, receiveBoxs } = userGuild;
let { donateFund, reports, donationLv } = await getDonation(code, guild, serverId);
let { donateFund, reports, donationLv } = await getDonation(code, guild);
return resResult(STATUS.SUCCESS, { receiveBoxs, donateFund, reports, donateCnt: donateCnt || 0, donationLv });
}
/**
@@ -82,7 +82,7 @@ export class DonationHandler {
res.releaseCallback();
return resResult(STATUS.GUILD_DONATE_TIMES_NOT_ENOUGH);
}
let { donationLv } = await getDonation(code, guild, serverId);
let { donationLv } = await getDonation(code, guild);
let { donateReward } = getArmyDonateBaseByLv(donationLv);
let { rewardGood, rewardFund, cosume } = donateReward.get(id);
let consumeResult = getVipDonateConsume(cosume, session.get('vipStartTime'));
@@ -93,7 +93,7 @@ export class DonationHandler {
}
let { donateCnt } = await UserGuildModel.donateFund(roleId, 1);
let { donateFund, reports } = await DonationModel.donation(code, rewardFund, { reports: { id, roleName, time: nowSeconds() } });
let { donateFund, reports } = await donate(code, rewardFund, id, roleName, guild);
let goods = [];
if (!!rewardGood)
goods = await addItems(roleId, roleName, sid, [rewardGood], ITEM_CHANGE_REASON.DONATE);
@@ -133,7 +133,7 @@ export class DonationHandler {
if (resReceiveBoxs.indexOf(id) != -1)
return resResult(STATUS.GUILD_DONATE_BOXS_IS_GOT);
let { boxRewards, fund, level } = getArmyDonateBoxBaseById(id);
let { donateFund, donationLv } = await getDonation(code, guild, serverId);
let { donateFund, donationLv } = await getDonation(code, guild);
if( donationLv < level) return resResult(STATUS.GUILD_DONATE_LV_NOT_ENOUGH)
if (donateFund < fund)
return resResult(STATUS.GUILD_DONATE_BOXS_NOT_GOT);