diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/EveryDayDiscountActivity.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/EveryDayDiscountActivity.java index 016a40d60..4cfc47e59 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/EveryDayDiscountActivity.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/activity/EveryDayDiscountActivity.java @@ -199,6 +199,9 @@ public class EveryDayDiscountActivity extends AbstractActivity { Map progressInfoMap = activityMission.getActivityMissionMap(); // 策划表的配置 Map dayGiftMap = SEveryDayGift.activitymap.get(id); + if (dayGiftMap == null){ + return new ArrayList<>(); + } // 返回对象 List missionInfos = new ArrayList<>(dayGiftMap.size()); for (SEveryDayGift dayGift : dayGiftMap.values()) { diff --git a/tablemanager/src/main/java/config/SEveryDayGift.java b/tablemanager/src/main/java/config/SEveryDayGift.java index 17024fc26..562290bb2 100644 --- a/tablemanager/src/main/java/config/SEveryDayGift.java +++ b/tablemanager/src/main/java/config/SEveryDayGift.java @@ -33,7 +33,8 @@ public class SEveryDayGift implements BaseConfig { public void init() throws Exception { map = STableManager.getConfig(SEveryDayGift.class); for (SEveryDayGift value : map.values()) { - activitymap.getOrDefault(value.globalActivity, new HashMap<>()).put(value.id, value); + activitymap.putIfAbsent(value.globalActivity, new HashMap<>()); + activitymap.get(value.globalActivity).put(value.id, value); } } diff --git a/tablemanager/src/main/java/config/SEveryDayGiftTask.java b/tablemanager/src/main/java/config/SEveryDayGiftTask.java index 04749db4d..a9bfd2073 100644 --- a/tablemanager/src/main/java/config/SEveryDayGiftTask.java +++ b/tablemanager/src/main/java/config/SEveryDayGiftTask.java @@ -33,8 +33,11 @@ public class SEveryDayGiftTask implements BaseConfig { public void init() throws Exception { map = STableManager.getConfig(SEveryDayGiftTask.class); for (SEveryDayGiftTask task : map.values()) { - activitymap.getOrDefault(task.getGlobalActivity(), new HashMap<>()).put(task.getId(), task); - taskmap.getOrDefault(task.getTaskType(), new HashMap<>()).put(task.getId(), task); + activitymap.put(task.getGlobalActivity(), new HashMap<>()); + activitymap.get(task.getGlobalActivity()).put(task.getId(), task); + + taskmap.put(task.getTaskType(), new HashMap<>()); + taskmap.get(task.getTaskType()).put(task.getId(), task); } }