From 3aab5ee06243f8268e5b0e340c3746d3838aefdc Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1769111741@qq.com> Date: Tue, 18 Jul 2023 15:49:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=A4=BC=E5=8C=85=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 7 +++++-- .../store/newRechargeInfo/rechargeHandler/PushHandler.java | 2 +- 2 files changed, 6 insertions(+), 3 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 9319f0e4f..8f7854c9f 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 @@ -88,6 +88,9 @@ public class BuyGoodsNewLogic { // 没有礼包先新增礼包 if(!rechargeHandler.rechargeIsInBag(user,entry.getKey())){ AbstractWelfareBag bag = rechargeHandler.initUnitWF(user, config); + if (bag == null){ + continue; + } rechargeHandler.addNew(user,bag); } // 刷新 @@ -1009,12 +1012,12 @@ public class BuyGoodsNewLogic { * @param user * @return */ - public static boolean createPushBag(int bagId,User user) throws Exception { + public static boolean createPushBag(int bagId,User user) { SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId); RechargeHandler handler = getRechargeHandler(config.getOtype()); PushWelfareBag pushBag = (PushWelfareBag) handler.getBag(user, bagId); if (pushBag == null){ - pushBag = (PushWelfareBag) handler.initUnitWF(user, config); + pushBag = new PushWelfareBag(user, config); } return pushBag.isBuy(); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java index 538a4914f..887e26110 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/rechargeHandler/PushHandler.java @@ -48,7 +48,7 @@ public class PushHandler extends AbstractRechargeHandler { @Override public AbstractWelfareBag initUnitWF(User user, SRechargeCommodityNewConfig config) { - return new PushWelfareBag(user,config); + return null; } @Override