Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn

back_recharge
lvxinran 2021-04-27 13:40:20 +08:00
commit 91db235c90
3 changed files with 18 additions and 6 deletions

View File

@ -1467,8 +1467,13 @@ public class TimeUtils {
} }
public static long getTodayZero(){ public static long getTodayZero(){
long current = System.currentTimeMillis(); Calendar calendar = Calendar.getInstance();
long zero = current/(1000*3600*24)*(1000*3600*24) - TimeZone.getDefault().getRawOffset(); System.out.println(calendar.getTimeInMillis());
return zero; 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;
} }
} }

View File

@ -414,15 +414,18 @@ public class BuyGoodsNewLogic {
* *
*/ */
public static boolean refreshUnitWF(AbstractWelfareBag bag,User user){ public static boolean refreshUnitWF(AbstractWelfareBag bag,User user){
boolean result = false;
//判断刷新时间 //判断刷新时间
if(bag.getRefreshTime() != 0 && bag.getRefreshTime() < System.currentTimeMillis()){ if(bag.getRefreshTime() != 0 && bag.getRefreshTime() < System.currentTimeMillis()){
bag.setOpen(true); bag.setOpen(true);
bag.setStartTime(TimeUtils.getTodayZero()); bag.setStartTime(TimeUtils.getTodayZero());
bag.refresh(); bag.refresh();
result = true;
} }
if(bag.isOpen()){ if(bag.isOpen()){
if(bag.getType() != 1 && bag.getEndTime() != 0 && System.currentTimeMillis() > bag.getEndTime()){ if(bag.getType() != 1 && bag.getEndTime() != 0 && System.currentTimeMillis() > bag.getEndTime()){
bagTimeUp(user,bag); bagTimeUp(user,bag);
result = true;
} }
}else{ }else{
if(bag.getType() == RechargeType.timeLimit.getType()){//活动类型特殊处理 if(bag.getType() == RechargeType.timeLimit.getType()){//活动类型特殊处理
@ -433,6 +436,7 @@ public class BuyGoodsNewLogic {
bag.setStartTime(sGlobalActivity.getStartTimeLong()); bag.setStartTime(sGlobalActivity.getStartTimeLong());
bag.setEndTime(sGlobalActivity.getEndTimeLong()); bag.setEndTime(sGlobalActivity.getEndTimeLong());
bag.setOpen(true); bag.setOpen(true);
result = true;
} }
} }
} }
@ -455,6 +459,7 @@ public class BuyGoodsNewLogic {
bag.setStartTime(System.currentTimeMillis()); bag.setStartTime(System.currentTimeMillis());
bag.setEndTime(bag.getStartTime() + endTime); bag.setEndTime(bag.getStartTime() + endTime);
bag.setOpen(true); bag.setOpen(true);
result = true;
} }
}else{ }else{
boolean open = true; boolean open = true;
@ -472,12 +477,12 @@ public class BuyGoodsNewLogic {
} }
if(open){ if(open){
bag.setOpen(true); 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){ public static void bagTimeUp(User user,AbstractWelfareBag bag){
bag.setOpen((false)); bag.setOpen((false));
bag.setLastBuyTime(0);
bag.setBuyTimes(0);
if(bag.getType() == RechargeType.push.getType()){ if(bag.getType() == RechargeType.push.getType()){
user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag); user.getPlayerInfoManager().getNewRechargeInfo().removePush((PushWelfareBag) bag);
} }

View File

@ -126,7 +126,7 @@ public class AbstractWelfareBag extends MongoBase{
}else if(getTimeType() == 8){//每月刷新 }else if(getTimeType() == 8){//每月刷新
setStartTime(TimeUtils.getCurMonthStartTime(1)); setStartTime(TimeUtils.getCurMonthStartTime(1));
setRefreshTime(TimeUtils.getMonthStartTime(1,1)); setRefreshTime(TimeUtils.getMonthStartTime(1,1));
}else if(getTimeType() == 5){//每月刷新 }else if(getTimeType() == 5){//玩家购买刷新
setRefreshTime(0); setRefreshTime(0);
}else{ }else{
for(String[] I : getCondition()){ for(String[] I : getCondition()){