From c5b4dcd3bdc0890ae670309db8618afa6139a428 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Mon, 19 Apr 2021 11:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jieling/logic/store/BuyGoodsNewLogic.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 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 b88adf71c..93ea26c9f 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 @@ -66,14 +66,23 @@ public class BuyGoodsNewLogic { /** * 登录刷新礼包 */ - public void refreshWelfareState(User user){ + public static void refreshWelfareState(User user){ List pAddList = new ArrayList<>(); List garbageList = new ArrayList<>(); NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); for(Map.Entry entry : SRechargeCommodityNewConfig.configMap.entrySet()){ Map perpetualWelfareBagMap = info.getPerpetualMap(); + Map timeLimitWelfareBagMap = info.getTimeLimitMap(); + Map receiveWelfareBagMap = info.getReceiveMap(); + Map pushWelfareBagMap = info.getPushMap(); if(perpetualWelfareBagMap.containsKey(entry.getKey())){ refreshUnitWF(perpetualWelfareBagMap.get(entry.getKey()),garbageList,user); + }else if(timeLimitWelfareBagMap.containsKey(entry.getKey())){ + refreshUnitWF(timeLimitWelfareBagMap.get(entry.getKey()),garbageList,user); + }else if(receiveWelfareBagMap.containsKey(entry.getKey())){ + refreshUnitWF(receiveWelfareBagMap.get(entry.getKey()),garbageList,user); + }else if(pushWelfareBagMap.containsKey(entry.getKey())){ + refreshUnitWF(pushWelfareBagMap.get(entry.getKey()),garbageList,user); }else{ AbstractWelfareBag bag = initUnitWF(user,entry.getValue()); pAddList.add(bag); @@ -398,7 +407,7 @@ public class BuyGoodsNewLogic { /** * 刷新单个礼包状态 */ - public void refreshUnitWF(AbstractWelfareBag bag,List garbageList,User user){ + public static void refreshUnitWF(AbstractWelfareBag bag,List garbageList,User user){ if(bag.isProhibited()){ garbageList.add(bag.getModId()); return; @@ -438,7 +447,7 @@ public class BuyGoodsNewLogic { /** * 初始化单个礼包 */ - public AbstractWelfareBag initUnitWF(User user,SRechargeCommodityNewConfig config){ + public static AbstractWelfareBag initUnitWF(User user,SRechargeCommodityNewConfig config){ AbstractWelfareBag bag = null; try{ if(config.getOtype() == 1){ @@ -459,7 +468,7 @@ public class BuyGoodsNewLogic { /** * 礼包到时处理 */ - public void bagTimeUp(AbstractWelfareBag bag){ + public static void bagTimeUp(AbstractWelfareBag bag){ bag.setOpen((false)); if(bag.getType() == RechargeType.timeLimit.getType() && bag.getDailyUpdate()<1){ bag.setProhibited(true); @@ -473,7 +482,7 @@ public class BuyGoodsNewLogic { /** * 礼包开启条件判断(除了时间) */ - public boolean judgeOpen(String[] con,User user) { + public static boolean judgeOpen(String[] con,User user) { if(con[0].equals("1")){ int level = user.getPlayerInfoManager().getLevel(); if(Integer.parseInt(con[1]) <= level && level <= Integer.parseInt(con[2])){ @@ -497,4 +506,12 @@ public class BuyGoodsNewLogic { } return true; } + + public static boolean getGoodsBagInfo(int uid,List giftGoodsInfoList,boolean needClear) throws Exception { + boolean needChange = false; + User user = UserManager.getUser(uid); + refreshWelfareState(user); + NewRechargeInfo rechargeInfo = user.getPlayerInfoManager().getNewRechargeInfo(); + return needChange; + } }