From 3eddd7610cd6587535ddd88413cef70e505f72f2 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 27 Nov 2019 15:43:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8A=9B=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ljsd/jieling/logic/activity/ActivityLogic.java | 11 ++++++++++- .../java/com/ljsd/jieling/logic/hero/HeroLogic.java | 4 ++++ .../java/com/ljsd/jieling/logic/rank/RankEnum.java | 1 + .../src/main/java/config/SGlobalActivity.java | 8 ++++++++ .../src/main/java/config/SLotterySetting.java | 4 ++++ 5 files changed, 27 insertions(+), 1 deletion(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java index 56da35fde..10854079e 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java @@ -32,6 +32,7 @@ import util.MathUtils; import util.TimeUtils; import java.util.*; +import java.util.stream.Stream; /** * @@ -1098,6 +1099,14 @@ public class ActivityLogic { MessageUtil.sendMessage(session,1,messageType.getNumber(),null,true); } - + public boolean getActivityStatusByType(User user,int type){ + List activities = SGlobalActivity.sGlobalActivityMapByType.get(type); + if(activities.isEmpty()){ + return false; + }else{ + Object[] objects = activities.stream().filter(n -> getActivityOpenState(user, n.getId()) != ActivityType.OPEN_STATE).toArray(); + return objects.length>0; + } + } } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java index 272cade07..c1a3f14bc 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java @@ -11,6 +11,7 @@ import com.ljsd.jieling.exception.ErrorCode; import com.ljsd.jieling.exception.ErrorCodeException; import com.ljsd.jieling.globals.BIReason; import com.ljsd.jieling.globals.Global; +import com.ljsd.jieling.logic.activity.ActivityLogic; import com.ljsd.jieling.logic.activity.event.HeroUpStarEvent; import com.ljsd.jieling.logic.activity.event.Poster; import com.ljsd.jieling.logic.dao.*; @@ -176,6 +177,9 @@ public class HeroLogic { if(type==11&&heroManager.getFirstTenth()==0){ heroManager.updateFirstTenth(); } + if(sLotterySetting.getLotteryType()==3&&!ActivityLogic.getInstance().getActivityStatusByType(user,sLotterySetting.getActivityId())){ + throw new ErrorCodeException(ErrorCode.ACTIVITY_NOT_OPEN); + } //筛选卡池 int pooId =0; int perCount = sLotterySetting.getPerCount(); diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java index 73246977c..7a825b07c 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java @@ -24,6 +24,7 @@ public enum RankEnum { static { rankMap = new HashMap<>(); + abstractRankMap = new HashMap<>(); Arrays.stream(RankEnum.values()).forEach((rankEnum)->rankMap.put(rankEnum.getType(),rankEnum)); } RankEnum(int type,String redisKey, BiFunction rankFunction){ diff --git a/tablemanager/src/main/java/config/SGlobalActivity.java b/tablemanager/src/main/java/config/SGlobalActivity.java index 998ef539c..2cf1db342 100644 --- a/tablemanager/src/main/java/config/SGlobalActivity.java +++ b/tablemanager/src/main/java/config/SGlobalActivity.java @@ -4,6 +4,9 @@ import manager.STableManager; import manager.Table; import util.TimeUtils; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; import java.util.Map; @Table(name ="GlobalActivity") @@ -43,10 +46,15 @@ public class SGlobalActivity implements BaseConfig { private int[] foreshow; + public static Map> sGlobalActivityMapByType; + + @Override public void init() throws Exception { + sGlobalActivityMapByType = new HashMap<>(); Map config = STableManager.getConfig(SGlobalActivity.class); for(SGlobalActivity sGlobalActivity : config.values()){ + sGlobalActivityMapByType.computeIfAbsent(sGlobalActivity.getType(),n->new ArrayList<>()).add(sGlobalActivity); int time = sGlobalActivity.getTime(); String startTime = sGlobalActivity.getStartTime(); String endtime = sGlobalActivity.getEndtime(); diff --git a/tablemanager/src/main/java/config/SLotterySetting.java b/tablemanager/src/main/java/config/SLotterySetting.java index 85dcbf193..7a402e50d 100644 --- a/tablemanager/src/main/java/config/SLotterySetting.java +++ b/tablemanager/src/main/java/config/SLotterySetting.java @@ -103,4 +103,8 @@ public class SLotterySetting implements BaseConfig { public int[][] getTenTimesMustGetBox() { return tenTimesMustGetBox; } + + public int getActivityId() { + return activityId; + } } \ No newline at end of file