From 3f0ecd8d6f38dc7c8094125d57c73371aef29c25 Mon Sep 17 00:00:00 2001 From: lvxinran Date: Wed, 21 Apr 2021 14:15:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=B1=BB=E5=9E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 68 ++++++++++--------- 1 file changed, 36 insertions(+), 32 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 7270ad2aa..292a2a607 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 @@ -58,6 +58,11 @@ public class BuyGoodsNewLogic { private static final Logger LOGGER = LoggerFactory.getLogger(BuyGoodsNewLogic.class); + + public static RechargeHandler getRechargeHandler(int type){ + return RechargeType.getHandler(type); + } + /** * 登录刷新礼包 */ @@ -170,15 +175,17 @@ public class BuyGoodsNewLogic { User user = UserManager.getUser(uid); NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); AbstractWelfareBag bag = null; - if(config.getOtype() == RechargeType.perpetual.getType()){ - bag = info.getPerpetualMap().get(goodsId); - }else if(config.getOtype() == RechargeType.timeLimit.getType()){ - bag = info.getTimeLimitMap().get(goodsId); - }else if(config.getOtype() == RechargeType.receive.getType()){ - bag = info.getReceiveMap().get(goodsId); - }else if(config.getOtype() == RechargeType.push.getType()){ - bag = info.getPushMap().get(goodsId); - } + RechargeHandler rechargeHandler = getRechargeHandler(config.getOtype()); +// if(config.getOtype() == RechargeType.perpetual.getType()){ +// bag = info.getPerpetualMap().get(goodsId); +// }else if(config.getOtype() == RechargeType.timeLimit.getType()){ +// bag = info.getTimeLimitMap().get(goodsId); +// }else if(config.getOtype() == RechargeType.receive.getType()){ +// bag = info.getReceiveMap().get(goodsId); +// }else if(config.getOtype() == RechargeType.push.getType()){ +// bag = info.getPushMap().get(goodsId); +// } + bag = rechargeHandler.getRechargeMap(user).get(goodsId); String rewardStr=""; if(bag == null || !bag.buy()){ LOGGER.error("购买失败!bag是否为空:{}",bag == null); @@ -452,26 +459,26 @@ public class BuyGoodsNewLogic { return false; } - /** - * 初始化单个礼包 - */ - public static AbstractWelfareBag initUnitWF(User user,SRechargeCommodityNewConfig config){ - AbstractWelfareBag bag = null; - try{ - if(config.getOtype() == 1){ - bag = new PerpetualWelfareBag(user,config); - }else if(config.getOtype() == 2){ - bag = new TimeLimitWelfareBag(user,config); - }else if(config.getOtype() == 3){ - bag = new ReceiveWelfareBag(user,config); - }else if(config.getOtype() == 4){ - bag = new PushWelfareBag(config); - } - }catch(Exception e){ - e.printStackTrace(); - } - return bag; - } +// /** +// * 初始化单个礼包 +// */ +// public static AbstractWelfareBag initUnitWF(User user,SRechargeCommodityNewConfig config){ +// AbstractWelfareBag bag = null; +// try{ +// if(config.getOtype() == 1){ +// bag = new PerpetualWelfareBag(user,config); +// }else if(config.getOtype() == 2){ +// bag = new TimeLimitWelfareBag(user,config); +// }else if(config.getOtype() == 3){ +// bag = new ReceiveWelfareBag(user,config); +// }else if(config.getOtype() == 4){ +// bag = new PushWelfareBag(config); +// } +// }catch(Exception e){ +// e.printStackTrace(); +// } +// return bag; +// } /** * 礼包到时处理 @@ -581,7 +588,4 @@ public class BuyGoodsNewLogic { } - public static RechargeHandler getRechargeHandler(int type){ - return RechargeType.getHandler(type); - } }