内存数据修复

back_recharge
zhangshanxue 2019-09-19 18:03:20 +08:00
parent 583fb7804b
commit 4667c72e15
2 changed files with 67 additions and 1 deletions

View File

@ -3,6 +3,7 @@ package com.ljsd.jieling.kefu;
import com.google.gson.Gson;
import com.ljsd.jieling.config.SErrorCodeEerverConfig;
import com.ljsd.jieling.config.SGameSetting;
import com.ljsd.jieling.config.SRechargeCommodityConfig;
import com.ljsd.jieling.dataReport.reportBeans_37.ChatContentType;
import com.ljsd.jieling.dataReport.reportBeans_37.Repot37EventUtil;
import com.ljsd.jieling.db.mongo.MongoUtil;
@ -11,8 +12,11 @@ import com.ljsd.jieling.db.redis.RedisUtil;
import com.ljsd.jieling.globals.BIReason;
import com.ljsd.jieling.globals.Global;
import com.ljsd.jieling.logic.OnlineUserManager;
import com.ljsd.jieling.logic.activity.ActivityLogic;
import com.ljsd.jieling.logic.activity.ActivityType;
import com.ljsd.jieling.logic.dao.ActivityManager;
import com.ljsd.jieling.logic.dao.PlayerManager;
import com.ljsd.jieling.logic.dao.RechargeInfo;
import com.ljsd.jieling.logic.dao.UserManager;
import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.hero.HeroLogic;
@ -67,6 +71,64 @@ public class Cmd_changename extends GmRoleAbstract {
}
if("recharge".equals(args[2])){
Gson gson = new Gson();
Map<Integer,Integer> hotGoods = new HashMap<>();
hotGoods = gson.fromJson(args[3],hotGoods.getClass());
Map<Integer,Integer> realBuyGoodsTimes = new HashMap<>();
realBuyGoodsTimes = gson.fromJson(args[3],realBuyGoodsTimes.getClass());
Map<Integer,Integer> oldBuyGoodsTimes = user.getPlayerInfoManager().getRechargeInfo().getBuyGoodsTimes();
for (Map.Entry<Integer,Integer> entry:oldBuyGoodsTimes.entrySet() ) {
if(realBuyGoodsTimes.containsKey(entry.getKey())){
int finalvalue = realBuyGoodsTimes.get(entry.getKey())-entry.getValue()
if(finalvalue==0){
realBuyGoodsTimes.remove(entry.getKey());
}else if(finalvalue>0){
realBuyGoodsTimes.put(entry.getKey(),finalvalue);
}else {
//日志记录不对
LOGGER.info("cmd_________recharge:err");
return false;
}
}
}
int hotRechargeMoney = 0;
for (Map.Entry<Integer,Integer> entry:realBuyGoodsTimes.entrySet()) {
if(entry.getKey()==1||entry.getKey()==2||entry.getKey()==3||entry.getKey()==4||entry.getKey()==5||entry.getKey()==13||entry.getKey()==14||entry.getKey()==15||entry.getKey()==16){
SRechargeCommodityConfig sRechargeCommodityConfig = SRechargeCommodityConfig.rechargeCommodityConfigMap.get(entry.getKey());
int price =sRechargeCommodityConfig.getPrice();
hotRechargeMoney+=entry.getValue()*price;
}
}
boolean mulvip =false;
if((realBuyGoodsTimes.containsKey(9)&&realBuyGoodsTimes.get(9)>1)||(realBuyGoodsTimes.containsKey(10)&&realBuyGoodsTimes.get(10)>1)||(realBuyGoodsTimes.containsKey(11)&&realBuyGoodsTimes.get(11)>1)){
mulvip =true;
}
RechargeInfo rechargeInfo = user.getPlayerInfoManager().getRechargeInfo();
int saveAmt = rechargeInfo.getSaveAmt();
// int[][] costItemArr = StringUtil.parseFiledInt2(rewardStr);
// for (int i = 0; i <costItemArr.length ; i++) {
// if(costItemArr[i][0]==Global.SOULCRYSTAL){
// rechargeInfo.addSoulCrystalAmt(costItemArr[i][1]);
// }
// }
rechargeInfo.setSaveAmt(hotRechargeMoney+saveAmt);
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RechargeTotal,rechargeInfo.getSaveAmt());
ActivityLogic.getInstance().updateActivityMissionProgress(user, ActivityType.RECHARGE_NUM,hotRechargeMoney);
user.getPlayerInfoManager().getRechargeInfo().setBuyGoodsTimes(hotGoods);
LOGGER.info("cmd_________recharge:hotRechargeMoney"+hotRechargeMoney+"重复月卡:"+mulvip);
}
}
String name;
if (args.length == 1) {

View File

@ -1484,16 +1484,20 @@ public class HeroLogic {
}
Set<String> ids = new HashSet<>();
for (HeroInfoProto.SoulEquipPos soulEquipPos : equipIds) {
if (hero.getSoulEquipByPositionMap().containsKey(soulEquipPos.getPosition())) {
String id = hero.getSoulEquipByPositionMap().get(soulEquipPos.getPosition());
SoulEquip oldEquip = user.getEquipManager().getSoulEquipMap().get(id);
if (null != oldEquip && !oldEquip.getId().equals(soulEquipPos.getEquipId())) {
oldEquip.setHeroId("");
if(!ids.contains(id)){
oldEquip.setHeroId("");
}
}
}
SoulEquip soulEquip = user.getEquipManager().getSoulEquipMap().get(soulEquipPos.getEquipId());
soulEquip.setHeroId(heroId);
ids.add(soulEquipPos.getEquipId());
hero.updateSoulEquipPositionMap(soulEquipPos.getPosition(), soulEquipPos.getEquipId());
}