From 3f6113ca9f97e8f369060943272e7ea6aa3f91c5 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Thu, 31 Oct 2019 14:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E7=94=B3=E8=AF=B7=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildLogic.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 1ffee5a8b..c1076808d 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 @@ -151,7 +151,18 @@ public class GuildLogic { Collection guildInfos = GuilidManager.recommandGuild(user); Family.FamilyRecommandResponse.Builder builder = Family.FamilyRecommandResponse.newBuilder(); 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(); + if(now - guildApply.getCreateTime() > SGuildSetting.sGuildSetting.getApplyReserve()){ + GuilidManager.removeOneApplyGuildInfos(guildApply.getGuildId(),guildApply.getId()); + continue; + } + } + } for(GuildInfo guildInfo : guildInfos){ + builder.addFamilyRecomandInfo(Family.FamilyRecomandInfo.newBuilder(). setFamilyBaseInfo(CBean2Proto.getFamilyBaseInfo(guildInfo)) .setIsApply(applyGuildInfos.containsKey(guildInfo.getId())?1:0)