From 1e9dc84c641d7a160a7c83620653ba3b0342f00c Mon Sep 17 00:00:00 2001 From: jiahuiwen Date: Thu, 21 Apr 2022 15:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BF=9F=E6=96=97=E6=B3=95=E9=80=80?= =?UTF-8?q?=E5=85=AC=E4=BC=9A=20=E5=88=A0=E4=B8=AA=E4=BA=BA=E6=8E=92?= =?UTF-8?q?=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ljsd/jieling/logic/family/GuildLogic.java | 8 +++++++- .../ljsd/jieling/logic/rank/rankImpl/AbstractRank.java | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) 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 b5ad5c382..8a0687bd0 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 @@ -16,6 +16,7 @@ import com.ljsd.jieling.globals.Global; import com.ljsd.jieling.jbean.ActivityMission; import com.ljsd.jieling.ktbeans.ReportEventEnum; import com.ljsd.jieling.ktbeans.ReportUtil; +import com.ljsd.jieling.logic.GlobleSystemLogic; import com.ljsd.jieling.logic.OnlineUserManager; import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.ActivityTypeEnum; @@ -1644,7 +1645,12 @@ public class GuildLogic { sendGuildHelpRewardEmail(user); // 车迟斗法个人排行清理 AbstractRank personRank = RankContext.getRankEnum(RankEnum.CAR_DEALY_RANK.getType()); - RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(personRank.getRedisKey(),"",true), String.valueOf(user.getId())); + if (GlobleSystemLogic.crossGroup == 0) { + RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(personRank.getRedisKey(),"",true), String.valueOf(user.getId())); + } else { + RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(personRank.getCrossRedisKey(),"",false), String.valueOf(user.getId())); + } + RedisUtil.getInstence().zsetRemoveOne(RedisUtil.getInstence().getKey(personRank.getCrossRedisKey(),"",true),String.valueOf(user.getId())); // RedisUtil.getInstence().putMapEntry(RedisKey.USER_LEVEL_GUILD_INFO,"",String.valueOf(user.getId()),guildId); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java index 4e6e469dd..e8a574159 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/rankImpl/AbstractRank.java @@ -132,7 +132,8 @@ public abstract class AbstractRank implements IRank { public String getCrossRedisKey() { int crossGroup = GlobleSystemLogic.getInstence().getCrossGroup(); - return RedisUtil.getInstence().getKey(redisKey,String.valueOf(crossGroup),false); + String key = RedisUtil.getInstence().getKey(redisKey, String.valueOf(crossGroup), false); + return key; } public int getType() {