Merge branch 'master_test_gn_zf' into master_test_gn

lvxinran 2021-06-24 17:01:14 +08:00
commit 216c3e2a94
2 changed files with 2 additions and 1 deletions

View File

@ -106,6 +106,7 @@ public class ArenaLogic {
.setTeam(teamBuild)
.build();
}else{
LOGGER.info("有问题的enemyId{}",enemyId);
User user = UserManager.getUser(enemyId);
int totalForce = HeroLogic.getInstance().calTeamTotalForce(user, GlobalsDef.TEAM_ARENA_DEFENSE,false);
List<TeamPosHeroInfo> teamPosHeroInfoList = user.getTeamPosManager().getTeamPosForHero().get(GlobalsDef.TEAM_ARENA_DEFENSE);

View File

@ -170,7 +170,7 @@ public class BuyGoodsNewLogic {
double priceTemp =config.getPrice();
int cfgType = SSpecialConfig.getIntegerValue(SSpecialConfig.EXCHANGE_FORCE_TYPE);
double price = priceTemp==0?0: SExchangeRate.doubleIntegerHashMap.get(cfgType).get((int)priceTemp);
if(amount!=-999&&!MathUtils.doubleEquals(amount,price * 100)){
if(amount!=-999&&!MathUtils.doubleEquals(amount,price * 100)&&!orderId.equals("support-order")){
resultRes.setResultCode(0);
resultRes.setResultMsg("charge count error");
LOGGER.error("charge count error, uid={},the goodId={}, currentPrice={},realPrice={}",uid,goodsId, amount,price);