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 c12226be8..9961371d2 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 @@ -644,7 +644,6 @@ public class BuyGoodsNewLogic { ArrayList welfareBags = new ArrayList<>(rechargeInfo.getPerpetualMap().values()); welfareBags.addAll(rechargeInfo.getTimeLimitMap().values()); welfareBags.addAll(rechargeInfo.getReceiveMap().values()); - welfareBags.addAll(rechargeInfo.getPushMap().values()); for (AbstractWelfareBag bag : welfareBags) { if(bag.isOpen()){ if (bag.getLimit() == 0 || bag.getLimit() > bag.getBuyTimes()){ @@ -653,6 +652,15 @@ public class BuyGoodsNewLogic { } } + for (AbstractWelfareBag bag : rechargeInfo.getPushMap().values()) { + PushWelfareBag bag1 = (PushWelfareBag)bag; + if(bag1.isOpen()){ + if (bag1.getLimit() == 0 || bag1.getLimit() > bag1.getBuyTimes()){ + list.add(bag1.getModId()); + } + } + } + // 走表判断开启的礼包 Map activityMap = SGlobalActivity.getsGlobalActivityMap(); Map missionMap = user.getActivityManager().getActivityMissionMap(); @@ -870,18 +878,15 @@ public class BuyGoodsNewLogic { if(id >= 7300 && id <= 7304){ return true; } - if(id >= 1100 && id <= 1104){ - return true; - } - return false; + return id >= 1100 && id <= 1104; } - public static boolean createPushBag(int bagId,User user,int num){ + private static boolean createPushBag(int bagId, User user, int num){ NewRechargeInfo info = user.getPlayerInfoManager().getNewRechargeInfo(); int hasOpen = 0; if(info.getTempLimitMap().containsKey(bagId)){ hasOpen = info.getTempLimitMap().get(bagId); - if(hasOpen >= info.FIVESTARLIMIT){ + if(hasOpen >= NewRechargeInfo.FIVESTARLIMIT){ return false; }else{ info.getTempLimitMap().put(bagId,hasOpen+num); @@ -891,14 +896,14 @@ public class BuyGoodsNewLogic { } if(isFiveStarBag(bagId) && info.getPushMap().get(bagId) != null){ AbstractWelfareBag bag = info.getPushMap().get(bagId); - bag.setLimit((bag.getLimit()+num)>info.FIVESTARLIMIT?info.FIVESTARLIMIT:(bag.getLimit()+num)); + bag.setLimit((bag.getLimit()+num)> NewRechargeInfo.FIVESTARLIMIT ? NewRechargeInfo.FIVESTARLIMIT :(bag.getLimit()+num)); bag.setStartTime(System.currentTimeMillis()); bag.setEndTime(bag.getStartTime() + getTime(bag) * TimeUtils.HOUR); }else{ SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(bagId); AbstractWelfareBag bag = initUnitWF(user,config); - if(num != 0 && num+hasOpen > info.FIVESTARLIMIT){ - bag.setLimit(info.FIVESTARLIMIT-hasOpen); + if(num != 0 && num+hasOpen > NewRechargeInfo.FIVESTARLIMIT){ + bag.setLimit(NewRechargeInfo.FIVESTARLIMIT -hasOpen); }else{ bag.setLimit(num); } diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java index af2a78bd1..9e9fe8cc7 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/AbstractWelfareBag.java @@ -194,7 +194,13 @@ public class AbstractWelfareBag extends MongoBase{ updateString("dailyUpdate",dailyUpdate); } - public int getLimit() { return limit; } + public int getLimit() { + SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(modId); + if (this instanceof PushWelfareBag){ + return limit; + } + return config.getLimit(); + } public void setLimit(int limit) { this.limit = limit; diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java index 8e30ead3b..62d22e06d 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/newRechargeInfo/bean/PushWelfareBag.java @@ -1,8 +1,6 @@ package com.ljsd.jieling.logic.store.newRechargeInfo.bean; import com.ljsd.jieling.logic.dao.root.User; -import com.ljsd.jieling.util.KeyGenUtils; -import com.ljsd.jieling.util.UUIDEnum; import config.SRechargeCommodityNewConfig; import util.TimeUtils;