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

军团：fix拒绝邀请未删除条目，升级建筑去锁

Browse Source
This commit is contained in:
luying
2021-02-23 11:47:47 +08:00
parent 6759a7dcb1
commit 53b873941e
4 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
game-server/app/servers/battle/handler/guildHandler.ts
View File

@@ -338,7 +338,7 @@ export class GuildHandler {
const checkResult = await checkAuth(GUILD_OPERATE.GET_APPLY_LIST, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const result = await UserGuildApplyModel.getListByGuild(code, lastApplyCode);
const result = await UserGuildApplyModel.findApplyByGuild(code, lastApplyCode);
const list = [];
for(let cur of result) {
let role = <RoleType>cur.role;
@@ -385,7 +385,7 @@ export class GuildHandler {
await sendMail(MAIL_TYPE.GUILD_APPLY_REFUSE, roleId, roleName, [guild.name]);
}
await UserGuildApplyModel.deleteApplyByApplyCode(applyCodeList);
await UserGuildApplyModel.deleteByApplyCode(applyCodeList);
}
return resResult(STATUS.SUCCESS, { roleIds });
@@ -460,7 +460,7 @@ export class GuildHandler {
const checkResult = await checkAuth(GUILD_OPERATE.GET_INVITATION_LIST, roleId);
if(!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
const result = await UserGuildApplyModel.getListByRole(roleId, lastApplyCode);
const result = await UserGuildApplyModel.findInviteByRole(roleId, lastApplyCode);
const list = result.map(cur => {
let guild = <GuildType>cur.guild;
let leader = <RoleType>guild.leader;
@@ -505,7 +505,7 @@ export class GuildHandler {
code = guild.code;
}
await UserGuildApplyModel.deleteApplyByApplyCode([applyCode]); // 删除这条邀请
await UserGuildApplyModel.deleteByApplyCode([applyCode]); // 删除这条邀请
return resResult(STATUS.SUCCESS, { applyCode, code, isReceived, hasGuild: isReceived });
}
@@ -727,44 +727,30 @@ export class GuildHandler {
const checkResult = await checkAuth(GUILD_OPERATE.UP_STRUCTURE, roleId, code);
if (!checkResult) return resResult(STATUS.GUILD_AUTH_NOT_ENOUGH);
let res:any = await lockData(serverId, DATA_NAME.UP_STRUCTURE, code);// 加锁
if (!!res.err) return resResult(STATUS.REDLOCK_ERR);
const guild = await GuildModel.findByCode(code, serverId, 'lv structure');
if(!guild) {
res.releaseCallback();//解锁
return resResult(STATUS.GUILD_NOT_FOUND);
}
const { lv, structure } = guild;
const curStructure = structure.find(cur => cur.id == id);
if(!curStructure) {
res.releaseCallback(); //解锁
return resResult(STATUS.GUILD_STRUCTURE_NOT_FOUND);
}
if(id != GUILD_STRUCTURE.ARMY_CENTER && curStructure.lv >= lv) { // 中军大帐以外建筑物
if(curStructure.lv >= lv) {
res.releaseCallback(); //解锁
return resResult(STATUS.GUILD_STRUCTURE_LV_MAX);
}
}
if(!hasStructureConsume(id, curStructure.lv + 1)) {
res.releaseCallback(); //解锁
return resResult(STATUS.GUILD_STRUCTURE_LV_MAX);
}
const cost = getStructureConsume(id, curStructure.lv);
const costResult = await GuildModel.costFund(code, cost);
if(!costResult) {
res.releaseCallback(); //解锁
const result = await GuildModel.upStructure(code, id, cost, 'code fund structure lv');
if(!result) {
return resResult(STATUS.GUILD_FUND_NOT_ENOUGH);
}
const result = await GuildModel.upStructure(code, id, 'code fund structure lv');
if(!result) {
res.releaseCallback(); //解锁
return resResult(STATUS.GUILD_STRUCTURE_NOT_FOUND);
}
res.releaseCallback(); //解锁
const resultStructure = result.structure.find(cur => cur.id == id);
// 修改信息