From 170796f61d3aa243c282cad78afc85df6b247a56 Mon Sep 17 00:00:00 2001 From: duhui Date: Fri, 27 Aug 2021 15:59:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=9D=A1=E4=BB=B6=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java index 3dd8a4cdb..9ba89369d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java @@ -675,16 +675,23 @@ public class BuyGoodsNewLogic { continue; } - // 活动未开启的礼包 - if (mission.getActivityState() != ActivityType.OPEN_STATE){ - for (String[] open : config.getCondition()) { - if ("3".equals(open[0])){ + for (String[] open : config.getCondition()) { + // 活动未开启的礼包 + if ("3".equals(open[0])){ + if (mission.getActivityState() != ActivityType.OPEN_STATE){ if (open[1].equals(String.valueOf(activityId))){ iterator.remove(); break; } } } + // 功能未开启的表 + if ("2".equals(open[0])){ + if (!GlobalDataManaager.getInstance().checkIsOpen(Integer.parseInt(open[1]))){ + iterator.remove(); + break; + } + } } } // 单独活动信息处理