From f8a502b6b058353f5aec8941cde1a4d97563a5dc Mon Sep 17 00:00:00 2001 From: lvxinran Date: Sat, 21 Nov 2020 15:17:31 +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 --- .../jieling/logic/store/BuyGoodsLogic.java | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java index 6ad1ef08c..2cb7e5115 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/store/BuyGoodsLogic.java @@ -437,8 +437,7 @@ public class BuyGoodsLogic { ExpeditionLogic.sendTreasureRewardUpdate(OnlineUserManager.getSessionByUid(user.getId()),user.getExpeditionManager().getWorldTreasureReward().getScore(),rewardStatusMap,user.getExpeditionManager().getWorldTreasureReward().getCreateTime(),1); } if(sRechargeCommodityConfig.getTime() ==5){ - long nextTime = TimeUtils.getLastOrUnderHour(TimeUtils.now() + sRechargeCommodityConfig.getDailyUpdate() * TimeUtils.DAY, 0, 0, true); - rechargeInfo.updateRefreshMapByKey(sRechargeCommodityConfig.getId(),nextTime); + rechargeInfo.updateRefreshMapByKey(sRechargeCommodityConfig.getId(),TimeUtils.now()+sRechargeCommodityConfig.getDailyUpdate()*TimeUtils.DAY); } resultRes.setResultCode(1); // KtEventUtils.onKtEvent(user, ParamEventBean.UserPayEvent,goodsId,orderId,resultRes.getResultCode(),price); @@ -585,9 +584,14 @@ public class BuyGoodsLogic { for(SRechargeCommodityConfig sRechargeCommodityConfig :SRechargeCommodityConfig.rechargeCommodityConfigMap.values()){ // 25闯关礼包、26、心魔试炼礼包 特殊处理 - if ((sRechargeCommodityConfig.getShowType() == 25 || sRechargeCommodityConfig.getShowType() == 26) - && !rechargeInfo.getBuyGoodsTimes().containsKey(sRechargeCommodityConfig.getId())) { - continue; + if (sRechargeCommodityConfig.getTime() == 6) { + if (!rechargeInfo.getRefreshBagMap().containsKey(sRechargeCommodityConfig.getId())) { + continue; + } + long dytime = rechargeInfo.getRefreshBagMap().get(sRechargeCommodityConfig.getId()) - now; + if(dytime <= 0){ + continue; + } } int limit = sRechargeCommodityConfig.getLimit(); int goodsId = sRechargeCommodityConfig.getId(); @@ -976,8 +980,11 @@ public class BuyGoodsLogic { // } // } if (sRechargeCommodityConfig.getTime() == 6) { - int dytime = rechargeInfo.getDyGoodsCanBuyTimes().getOrDefault(goodsId,0)-1; - if(dytime <0){ + if (!rechargeInfo.getRefreshBagMap().containsKey(sRechargeCommodityConfig.getId())) { + continue; + } + long dytime = rechargeInfo.getRefreshBagMap().get(sRechargeCommodityConfig.getId()) - now; + if(dytime <= 0){ continue; } }