From 926b00a6911c4528afced1a11b4c067f4cdb7c19 Mon Sep 17 00:00:00 2001 From: zhangshanxue Date: Thu, 12 Dec 2019 13:35:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Task=E3=80=90ID1005229=E3=80=91=E3=80=90?= =?UTF-8?q?=E7=89=B9=E6=9D=83=E8=B0=83=E6=95=B4=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java | 5 +++++ .../main/java/com/ljsd/jieling/logic/store/StoreLogic.java | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java index 3310b9d70..c2e639b26 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/handler/vip/VipTakeDailyHandler.java @@ -7,6 +7,7 @@ import com.ljsd.jieling.handler.BaseHandler; import com.ljsd.jieling.logic.dao.PlayerManager; import com.ljsd.jieling.logic.dao.UserManager; import com.ljsd.jieling.logic.dao.root.User; +import com.ljsd.jieling.logic.store.GiftGoodsType; import com.ljsd.jieling.network.session.ISession; import com.ljsd.jieling.protocols.CommonProto; import com.ljsd.jieling.protocols.MessageTypeProto; @@ -33,6 +34,10 @@ public class VipTakeDailyHandler extends BaseHandler Date: Sun, 15 Dec 2019 16:15:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?TASK=E3=80=90ID1005286=E3=80=91=E3=80=90?= =?UTF-8?q?=E8=BE=BE=E4=BA=BA=E6=B4=BB=E5=8A=A8=E7=9A=84=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C=E4=BC=98=E5=8C=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/ExpectRankActivity.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java index 75705ebc1..a5b15ad33 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java @@ -64,15 +64,26 @@ class ExpectRankActivity extends AbstractActivity { if(null==sActivityRankingReward) return; int maxRank = 0; + int maxRewardId = 0; Map rank2miss = new HashMap<>(); for (SActivityRankingReward sActivityRankingReward1 : sActivityRankingReward) { - maxRank = Math.max(maxRank, sActivityRankingReward1.getMaxRank()); + if(sActivityRankingReward1.getMaxRank()==-1){ + maxRank =-1; + maxRewardId = sActivityRankingReward1.getId(); + continue; + } + + if(maxRank!=-1) + { + maxRank = Math.max(maxRank, sActivityRankingReward1.getMaxRank()); + } + for (Integer rank : getRankSet(sActivityRankingReward1.getMinRank(), sActivityRankingReward1.getMaxRank())) { rank2miss.put(rank, sActivityRankingReward1.getId()); } } - Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, maxRank - 1); + Set> rankInfo = RedisUtil.getInstence().getZsetreverseRangeWithScores(RedisKey.EXPERT_RANK, Integer.toString(id), 0, (maxRank==-1?0:maxRank) - 1); int rank = 1; int nowTime = (int) (TimeUtils.now() / 1000); for (ZSetOperations.TypedTuple item : rankInfo) { @@ -86,7 +97,17 @@ class ExpectRankActivity extends AbstractActivity { if (activityMission == null || activityMission.getOpenType() == 0) { continue; } - int missionId = rank2miss.get(rank); + int missionId ; + if(rank2miss.containsKey(rank)) { + missionId = rank2miss.get(rank); + }else { + if(maxRank==-1){ + missionId = maxRewardId; + }else { + continue; + } + } + //check value SActivityRankingReward sActivityRankingReward1 = SActivityRankingReward.getsActivityRankingRewardMap().get(missionId); //sendmail