From 4982b2c70da23a167f583b19a605d0b63813183e Mon Sep 17 00:00:00 2001 From: xuexinpeng Date: Fri, 25 Feb 2022 14:34:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=E5=86=B2=E5=88=BA=E9=82=AE?= =?UTF-8?q?=E4=BB=B6=E5=A5=96=E5=8A=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logic/activity/PowerRiceActivity.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/PowerRiceActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/PowerRiceActivity.java index fa870e890..24229e167 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/PowerRiceActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/PowerRiceActivity.java @@ -82,26 +82,12 @@ public class PowerRiceActivity extends AbstractActivity{ final int rankIndex = keval.getKey(); String title = SErrorCodeEerverConfig.getI18NMessage("battlecapacityrank_mail_title"); String content = SErrorCodeEerverConfig.getFormatMessage("battlecapacityrank_mail_txt", new Object[]{rankIndex}); - SActivityRankingReward activityReward =sActivityRankingReward.stream().filter(n->rankIndex>=n.getMinRank() && rankIndex>=n.getMaxRank()).findFirst().orElse(null); + SActivityRankingReward activityReward =sActivityRankingReward.stream().filter(n->rankIndex>=n.getMinRank() && rankIndex<=n.getMaxRank()).findFirst().orElse(null); if(activityReward == null){ continue; } MailLogic.getInstance().sendMail(keval.getValue(), title, content, StringUtil.parseArrayToString(activityReward.getRankingReward()), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); } - /* AbstractRank powerRank = RankContext.getRankEnum(RankEnum.POWER_RICE_RANK.getType()); - Set> rankInfos = powerRank.getRankByKey("", 0,-1); - int index = 1; - for(ZSetOperations.TypedTuple rankInfo:rankInfos){ - String title = SErrorCodeEerverConfig.getI18NMessage("battlecapacityrank_mail_title"); - String content = SErrorCodeEerverConfig.getFormatMessage("battlecapacityrank_mail_txt", new Object[]{index}); - final int rankIndex = index; - SActivityRankingReward activityReward =sActivityRankingReward.stream().filter(n->rankIndex>=n.getMinRank() && rankIndex>=n.getMaxRank()).findFirst().orElse(null); - if(activityReward == null){ - continue; - } - MailLogic.getInstance().sendMail(Integer.parseInt(rankInfo.getValue()), title, content, StringUtil.parseArrayToString(activityReward.getRankingReward()), TimeUtils.nowInt(), Global.MAIL_EFFECTIVE_TIME); - index++; - }*/ GlobalSystemControl globalSystemControl = GlobalSystemControl.getGlobalSystemControl(); globalSystemControl.addActivityPreEnd(id,TimeUtils.now()); GlobalSystemControl.save(globalSystemControl);