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

军团：添加锁

Browse Source
This commit is contained in:
luying
2021-01-26 16:53:47 +08:00
parent fb56dd00ec
commit 02b21f27e0
7 changed files with 93 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
import { Application, BackendSession, pinus, ChannelService } from 'pinus';
import { resResult, getRandEelm, reduceCe, getRefTime } from '../../../pubUtils/util';
import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY } from '../../../consts';
import { STATUS, GUILD_OPERATE, GUILD_AUTH, GUILD_JOB, GUILD_APPLY_TYPE, GUILD_STRUCTURE, GUILD_REC_TYPE, GUILD_STRUCTURE_NAME, MAIL_TYPE, REDIS_KEY, GUILD_DATA_NAME } from '../../../consts';
import { UserGuildModel } from '../../../db/UserGuild';
import { checkAuth, joinGuild, getGuildWithRefActive, getUserGuildWithRefActive, addActive, message, settleGuildWeekly } from '../../../services/guildService';
import { GuildModel, GuildType } from '../../../db/Guild';
@@ -15,6 +15,7 @@ import { hasStructureConsume, getStructureConsume, gameData } from '../../../pub
import { GuildRecModel } from '../../../db/GuildRec';
import { sendMail } from '../../../services/mailService';
import { existsRank, initSingleRankWithServer, getRank, setRank, redisUserInfoUpdate, redisUserInfoAdd, removeFromRank, getMyRank } from '../../../services/redisService';
import { lockData } from '../../../services/redLockService';
import { openGuildRefine } from '../../../services/guildRefineService';
import { unlockTrain } from '../../../services/guildTrainService';
@@ -638,7 +639,7 @@ export class GuildHandler {
const roleId = session.get('roleId');
const roleName = session.get('roleName');
const sid = session.get('sid');
// const serverId = session.get('serverId');
const serverId = session.get('serverId');
const { code, roleId: leaderRoleId } = msg;
// 弹劾的权限
@@ -670,7 +671,6 @@ export class GuildHandler {
const topUser = <RoleType>topUserGuild.role;
// 交换
// TODO redlock
await UserGuildModel.updateInfo(leaderRoleId, { auth: GUILD_AUTH.MEMBER }, {}, 'auth'); // 团长撤
await UserGuildModel.updateInfo(topUserGuild.roleId, { auth: GUILD_AUTH.LEADER }, {}, 'auth'); // 最高功勋人升
let managerCntInc = topUserGuild.auth == GUILD_AUTH.MANAGER ? -1 : 0; // 管理人数
@@ -705,35 +705,44 @@ 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, GUILD_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);
}
// TODO 加写锁
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(); //解锁
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);
// 修改信息