周卡月卡调整,兼容老版本3

duhui 2023-07-18 19:53:14 +08:00
parent 43873b23eb
commit 3261813450
2 changed files with 9 additions and 13 deletions

View File

@ -47,6 +47,7 @@ import com.ljsd.jieling.logic.mission.main.ServenMissionIdsType;
import com.ljsd.jieling.logic.store.BuyGoodsNewLogic;
import com.ljsd.jieling.logic.store.newRechargeInfo.NewRechargeInfo;
import com.ljsd.jieling.logic.store.newRechargeInfo.bean.AbstractWelfareBag;
import com.ljsd.jieling.logic.store.newRechargeInfo.bean.ReceiveWelfareBag;
import com.ljsd.jieling.logic.store.newRechargeInfo.rechargeHandler.RechargeHandler;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.thrift.idl.*;
@ -1685,8 +1686,8 @@ public class PlayerLogic {
int state = 0;
SRechargeCommodityNewConfig config = SRechargeCommodityNewConfig.getConfigById(monthcardConfig.getPrice());
RechargeHandler rechargeHandler = BuyGoodsNewLogic.getRechargeHandler(config.getOtype());
AbstractWelfareBag bag = rechargeHandler.getRechargeMap(user).get(config.getId());
if (bag != null && !bag.checkBuy()){
ReceiveWelfareBag bag = (ReceiveWelfareBag)rechargeHandler.getRechargeMap(user).get(config.getId());
if (bag != null && bag.isBought()){
state = playerInfoManager.getMonthCardDailyTake().contains(monthcardConfig.getId())?2:1;
}
@ -1708,7 +1709,6 @@ public class PlayerLogic {
playerInfoManager.setMonthCard(new HashMap<>());
if (createTime < format2 && rmb >= 100){
HashMap<Integer, Integer> map = new HashMap<>();
Map<Integer, SMonthcardConfig> configMap = STableManager.getConfig(SMonthcardConfig.class);
for (SMonthcardConfig config : configMap.values()) {
int goodId = config.getPrice();
@ -1726,7 +1726,6 @@ public class PlayerLogic {
}
BuyGoodsNewLogic.activeMonthCard(user,goodId);
}
playerInfoManager.setMonthCard(map);
}
playerInfoManager.setOldMonthCardMark(1);
}

View File

@ -1,7 +1,5 @@
package com.ljsd.jieling.logic.store;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.ljsd.GameApplication;
import com.ljsd.jieling.config.reportData.DataMessageUtils;
import com.ljsd.jieling.core.VipPrivilegeType;
@ -14,9 +12,6 @@ import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.jbean.ActivityMission;
import com.ljsd.jieling.ktbeans.KtEventUtils;
import com.ljsd.jieling.ktbeans.ReportBaseBean;
import com.ljsd.jieling.ktbeans.ReportEventEnum;
import com.ljsd.jieling.ktbeans.ReportUtil;
import com.ljsd.jieling.ktbeans.parmsBean.ParamEventBean;
import com.ljsd.jieling.logic.GlobalDataManaager;
import com.ljsd.jieling.logic.OnlineUserManager;
@ -24,7 +19,6 @@ import com.ljsd.jieling.logic.activity.AbstractActivity;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.activity.ActivityTypeEnum;
import com.ljsd.jieling.logic.activity.activityLogic.WeekCardLogic;
import com.ljsd.jieling.logic.activity.event.*;
import com.ljsd.jieling.logic.dao.PlayerManager;
import com.ljsd.jieling.logic.dao.RechargeInfo;
@ -45,7 +39,6 @@ import com.ljsd.jieling.network.server.ProtocolsManager;
import com.ljsd.jieling.network.session.ISession;
import com.ljsd.jieling.thrift.idl.Result;
import com.ljsd.jieling.util.*;
import com.ljsd.jieling.util.http.HttpPool;
import config.*;
import manager.STableManager;
import org.slf4j.Logger;
@ -497,16 +490,20 @@ public class BuyGoodsNewLogic {
if (bag == null){
return;
}
long now = TimeUtils.now();
/*long now = TimeUtils.now();
// 时间验证
if (now < bag.getStartTime() || now > bag.getRefreshTime()){
return;
}
}*/
Map<Integer, SMonthcardConfig> monthcardConfigMap = STableManager.getConfig(SMonthcardConfig.class);
boolean sendneed =false;
for (SMonthcardConfig monthcardConfig : monthcardConfigMap.values()) {
if (goodId == monthcardConfig.getPrice()){
ReceiveWelfareBag receiveWelfareBag = (ReceiveWelfareBag) bag;
if (!receiveWelfareBag.isBought()){
continue;
}
sendneed=true;
// 当天零点
int beginOfDay = (int) (TimeUtils.getBeginOfDay(TimeUtils.now())/1000);