From af304a8d85d8cdef7f946d1ddb64d177d1cb612b Mon Sep 17 00:00:00 2001 From: wangyuan Date: Tue, 29 Oct 2019 17:17:40 +0800 Subject: [PATCH] fix usermission & guild --- .../com/ljsd/jieling/logic/dao/UserMissionManager.java | 7 +++++-- .../java/com/ljsd/jieling/logic/family/GuildLogic.java | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java index c366b5c06..c319211c0 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserMissionManager.java @@ -170,8 +170,11 @@ public class UserMissionManager extends MongoBase { break; case DAILY_MISSION_REWARD:{ dailyMissionIdsType.rewardMission((int)parm[0], missionTypeEnumListMap.get(GameMisionType.DAILYMISSION)); - calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]); - updateString("dailyMissionIdsType",dailyMissionIdsType); + if(!missionTypeEnumListMap.get(GameMisionType.DAILYMISSION).isEmpty()){ + calCumulationDataResult(user,MissionType.FINSIH_DAYILY_TIMES,missionTypeEnumListMap,(int)parm[0]); + updateString("dailyMissionIdsType",dailyMissionIdsType); + } + } break; case TREASURE_MISSION_REWARD:{ diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java index 25ceb6d4e..fb4f32899 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java @@ -153,12 +153,15 @@ public class GuildLogic { Map applyGuildInfos = GuilidManager.getApplyGuildInfos(uid, 1); int now =(int)(System.currentTimeMillis()/1000); if(applyGuildInfos.size()>0){ - for(Map.Entry applyEntry:applyGuildInfos.entrySet()){ - GuildApply guildApply = applyEntry.getValue(); + Iterator> iterator = applyGuildInfos.entrySet().iterator(); + while (iterator.hasNext()){ + Map.Entry next = iterator.next(); + GuildApply guildApply = next.getValue(); if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){ GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId()); - continue; + iterator.remove(); } + } } for(GuildInfo guildInfo : guildInfos){