root
/
miduo_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

已加入工会提示

back_recharge
lvxinran 2019-09-27 15:02:46 +08:00
parent 8867433bf4
commit 4fa201093a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
View File

@ -242,6 +242,10 @@ public class GuildLogic {
MessageUtil.sendErrorResponse(session,0,msgId,"公会不存在"); MessageUtil.sendErrorResponse(session,0,msgId,"公会不存在");
return; return;
} }
if(guildInfo.getJoinType()!=1){
MessageUtil.sendErrorResponse(session,0,msgId,"该工会限制条件已修改");
return;
}
if(user.getPlayerInfoManager().getLevel()<guildInfo.getIntoLevel()){ if(user.getPlayerInfoManager().getLevel()<guildInfo.getIntoLevel()){
MessageUtil.sendErrorResponse(session,Global.SHOW_TIPS_ERROR,msgId,"条件不符，无法加入"); MessageUtil.sendErrorResponse(session,Global.SHOW_TIPS_ERROR,msgId,"条件不符，无法加入");
return; return;
@ -412,13 +416,21 @@ public class GuildLogic {
MessageUtil.sendErrorResponse(session,0,msgId,"全部同意后公会人数将大于最大人数，请单个同意"); MessageUtil.sendErrorResponse(session,0,msgId,"全部同意后公会人数将大于最大人数，请单个同意");
return; return;
} }
boolean memberGuild = false;
for(Integer addUid : applyGuild.keySet()){ for(Integer addUid : applyGuild.keySet()){
if(UserManager.getUser(addUid).getPlayerInfoManager().getGuildId()!=0){
memberGuild = true;
continue;
}
if(30-count<=0){ if(30-count<=0){
break; break;
} }
applyToJoin(guildInfo,addUid,true); applyToJoin(guildInfo,addUid,true);
count++; count++;
} }
if(memberGuild){
MessageUtil.sendErrorResponse(session,0,msgId,"部分成员已经加入其他工会！");
}
for(Map.Entry<Integer, GuildApply> entry:applyGuild.entrySet()){ for(Map.Entry<Integer, GuildApply> entry:applyGuild.entrySet()){
GuilidManager.removeOneApplyGuildInfos(entry.getValue().getGuildId(),entry.getValue().getId()); GuilidManager.removeOneApplyGuildInfos(entry.getValue().getGuildId(),entry.getValue().getId());
Map<Integer, GuildApply> applyPersonal = GuilidManager.getApplyGuildInfos(entry.getValue().getId(), 1); Map<Integer, GuildApply> applyPersonal = GuilidManager.getApplyGuildInfos(entry.getValue().getId(), 1);
@ -435,6 +447,9 @@ public class GuildLogic {
} }
break; break;
case 3: //同意一个 case 3: //同意一个
if(UserManager.getUser(applyId).getPlayerInfoManager().getGuildId()!=0){
MessageUtil.sendErrorResponse(session,0,msgId,"该成员已经加入其他工会！");
}
if(guildInfo.getTotalMembers()>=SGuildLevelConfig.sGuildLevelConfigMap.get(guildInfo.getLevel()).getNum()){ if(guildInfo.getTotalMembers()>=SGuildLevelConfig.sGuildLevelConfigMap.get(guildInfo.getLevel()).getNum()){
MessageUtil.sendErrorResponse(session,0,msgId,"公会人数已满，无法加入"); MessageUtil.sendErrorResponse(session,0,msgId,"公会人数已满，无法加入");
return; return;