Merge branch 'master_online_hw' into master_test_hw

back_recharge
zhangshanxue 2020-09-27 18:19:02 +08:00
commit 935131223e
2 changed files with 13 additions and 0 deletions

View File

@ -248,6 +248,9 @@ public class MongoUtil {
} else { } else {
if (!value.equals(o2.get(key))) { if (!value.equals(o2.get(key))) {
builder.append("type22222:o1 k-v= [" + key + ":" + value + "]\r\n"); builder.append("type22222:o1 k-v= [" + key + ":" + value + "]\r\n");
if(o2.get(key).toString().contains("expeditionManager")){
break;
}
builder2.append("type22222:o2 k-v= [" + key + ":" + o2.get(key) + "]\r\n"); builder2.append("type22222:o2 k-v= [" + key + ":" + o2.get(key) + "]\r\n");
is = false; is = false;
} }

View File

@ -853,6 +853,16 @@ public class BuyGoodsLogic {
if(ids.size()==0){ if(ids.size()==0){
continue; continue;
} }
} else if(sRechargeCommodityConfig.getType() == 8){
if(rechargeInfo.getGoodsDurationMap().containsKey(78)||rechargeInfo.getGoodsDurationMap().containsKey(80));
{
continue;
}
}else if(sRechargeCommodityConfig.getType() ==9){
if(rechargeInfo.getGoodsDurationMap().containsKey(79)||rechargeInfo.getGoodsDurationMap().containsKey(81));
{
continue;
}
} }