From 3af3a725c3c8ad97d0f5d4c19f057f4832b62e25 Mon Sep 17 00:00:00 2001 From: mengchengzhen <13682025901@163.com> Date: Wed, 28 Apr 2021 00:27:43 +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 --- gamecommon/src/main/java/util/TimeUtils.java | 11 ++++++++--- .../ljsd/jieling/logic/store/BuyGoodsNewLogic.java | 11 +++++++++-- .../newRechargeInfo/bean/AbstractWelfareBag.java | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/gamecommon/src/main/java/util/TimeUtils.java b/gamecommon/src/main/java/util/TimeUtils.java index 0486ea902..bc34653c1 100644 --- a/gamecommon/src/main/java/util/TimeUtils.java +++ b/gamecommon/src/main/java/util/TimeUtils.java @@ -1467,8 +1467,13 @@ public class TimeUtils { } public static long getTodayZero(){ - long current = System.currentTimeMillis(); - long zero = current/(1000*3600*24)*(1000*3600*24) - TimeZone.getDefault().getRawOffset(); - return zero; + Calendar calendar = Calendar.getInstance(); + System.out.println(calendar.getTimeInMillis()); + calendar.set(Calendar.SECOND, 0); + calendar.set(Calendar.MINUTE, 0); + calendar.set(Calendar.HOUR_OF_DAY, 0); + calendar.set(Calendar.MILLISECOND, 0); + long todayZero = calendar.getTimeInMillis(); + return todayZero; } } \ No newline at end of file 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 2533d2d60..ff77fd75f 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 @@ -414,15 +414,18 @@ public class BuyGoodsNewLogic { * 刷新单个礼包状态 */ public static boolean refreshUnitWF(AbstractWelfareBag bag,User user){ + boolean result = false; //判断刷新时间 if(bag.getRefreshTime() != 0 && bag.getRefreshTime() < System.currentTimeMillis()){ bag.setOpen(true); bag.setStartTime(TimeUtils.getTodayZero()); bag.refresh(); + result = true; } if(bag.isOpen()){ if(bag.getType() != 1 && bag.getEndTime() != 0 && System.currentTimeMillis() > bag.getEndTime()){ bagTimeUp(user,bag); + result = true; } }else{ if(bag.getType() == RechargeType.timeLimit.getType()){//活动类型特殊处理 @@ -433,6 +436,7 @@ public class BuyGoodsNewLogic { bag.setStartTime(sGlobalActivity.getStartTimeLong()); bag.setEndTime(sGlobalActivity.getEndTimeLong()); bag.setOpen(true); + result = true; } } } @@ -455,6 +459,7 @@ public class BuyGoodsNewLogic { bag.setStartTime(System.currentTimeMillis()); bag.setEndTime(bag.getStartTime() + endTime); bag.setOpen(true); + result = true; } }else{ boolean open = true; @@ -472,12 +477,12 @@ public class BuyGoodsNewLogic { } if(open){ bag.setOpen(true); - return true; + result = true; } } } } - return false; + return result; } /** @@ -506,6 +511,8 @@ public class BuyGoodsNewLogic { */ public static void bagTimeUp(User user,AbstractWelfareBag bag){ bag.setOpen((false)); + bag.setLastBuyTime(0); + bag.setBuyTimes(0); if(bag.getType() == RechargeType.push.getType()){ user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag); } 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 d4ca96193..7febdaf73 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 @@ -126,7 +126,7 @@ public class AbstractWelfareBag extends MongoBase{ }else if(getTimeType() == 8){//每月刷新 setStartTime(TimeUtils.getCurMonthStartTime(1)); setRefreshTime(TimeUtils.getMonthStartTime(1,1)); - }else if(getTimeType() == 5){//每月刷新 + }else if(getTimeType() == 5){//玩家购买刷新 setRefreshTime(0); }else{ for(String[] I : getCondition()){