Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw
commit
dc59c1f768
|
@ -248,6 +248,9 @@ public class MongoUtil {
|
|||
} else {
|
||||
if (!value.equals(o2.get(key))) {
|
||||
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");
|
||||
is = false;
|
||||
}
|
||||
|
|
|
@ -853,6 +853,16 @@ public class BuyGoodsLogic {
|
|||
if(ids.size()==0){
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue