周卡月卡调整,兼容老版本2
parent
f8e2852405
commit
43873b23eb
|
@ -304,6 +304,12 @@ public class TimeUtils {
|
|||
return format1.parse(time);
|
||||
}
|
||||
|
||||
public static long dateFormat2(String time) throws ParseException {
|
||||
DateFormat format1 = new SimpleDateFormat(ymdhms_Format_new);
|
||||
return format1.parse(time).getTime();
|
||||
}
|
||||
|
||||
|
||||
// /**
|
||||
// * 是否是同一天
|
||||
// *
|
||||
|
|
|
@ -63,6 +63,7 @@ import rpc.protocols.PlayerInfoProto;
|
|||
import util.MathUtils;
|
||||
import util.TimeUtils;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
|
@ -1694,24 +1695,40 @@ public class PlayerLogic {
|
|||
return cardInfos;
|
||||
}
|
||||
|
||||
public void checkOldMonthCard(User user){
|
||||
if (user.getPlayerInfoManager().getOldMonthCardMark() == 1){
|
||||
public void checkOldMonthCard(User user) throws ParseException {
|
||||
PlayerManager playerInfoManager = user.getPlayerInfoManager();
|
||||
if (playerInfoManager.getOldMonthCardMark() == 1){
|
||||
return;
|
||||
}
|
||||
Map<Integer, Integer> monthCard = user.getPlayerInfoManager().getMonthCard();
|
||||
|
||||
double rmb = playerInfoManager.getNewRechargeInfo().getRr();
|
||||
|
||||
long createTime = playerInfoManager.getCreateTime();
|
||||
long format2 = TimeUtils.dateFormat2("2022-06-11 00:00:00");
|
||||
|
||||
playerInfoManager.setMonthCard(new HashMap<>());
|
||||
if (createTime < format2 && rmb >= 100){
|
||||
HashMap<Integer, Integer> map = new HashMap<>();
|
||||
Integer oldone = monthCard.get(1);
|
||||
if (oldone!=null){
|
||||
int begin = (int)(TimeUtils.getBeginOfDay(oldone * 1000)/1000);
|
||||
map.put(2,begin);
|
||||
Map<Integer, SMonthcardConfig> configMap = STableManager.getConfig(SMonthcardConfig.class);
|
||||
for (SMonthcardConfig config : configMap.values()) {
|
||||
int goodId = config.getPrice();
|
||||
SRechargeCommodityNewConfig newConfig = SRechargeCommodityNewConfig.getConfigById(goodId);
|
||||
RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(newConfig.getOtype());
|
||||
AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(goodId);
|
||||
if (bag == null){
|
||||
LOGGER.error("老玩家月卡兼容报错,礼包信息不存在,uid:{},goodid:{}",user.getId(),goodId);
|
||||
continue;
|
||||
}
|
||||
Integer oldtwo = monthCard.get(2);
|
||||
if (oldtwo!=null){
|
||||
int begin = (int)(TimeUtils.getBeginOfDay(oldtwo * 1000)/1000);
|
||||
map.put(3,begin);
|
||||
boolean bol = bag.buy();
|
||||
if (!bol){
|
||||
LOGGER.error("老玩家月卡兼容报错,礼包已购买,uid:{},goodid:{}",user.getId(),goodId);
|
||||
continue;
|
||||
}
|
||||
user.getPlayerInfoManager().setMonthCard(map);
|
||||
user.getPlayerInfoManager().setOldMonthCardMark(1);
|
||||
BuyGoodsNewLogic.activeMonthCard(user,goodId);
|
||||
}
|
||||
playerInfoManager.setMonthCard(map);
|
||||
}
|
||||
playerInfoManager.setOldMonthCardMark(1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue