diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java index e62e7a9a..82973ccf 100644 --- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java +++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java @@ -229,7 +229,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar //用户、桩、平台(最小的) int number =0; - if(!"".equals(userMessage.get("socUser")) && userMessage.get("socUser") !=null && !"".equals(userMessage.get("socUser"))){ + if(!"".equals(userMessage.get("socUser")) && userMessage.get("socUser") !=null && userMessage.get("socProtect") !=null && !"0".equals(userMessage.get("socProtect").toString())){ number =Integer.parseInt(userMessage.get("socUser").toString()); } //平台 @@ -252,7 +252,6 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar }else{ number=Integer.parseInt(operatorMessage.get("soc").toString()); } - } if(number !=0){ startChargingData.setSoc(number); @@ -738,7 +737,7 @@ public class XhpcChargeOrderServiceImpl extends BaseService implements IXhpcChar map.put("serialNumber",orderNo); //用户、桩、平台(最小的) int number =0; - if(!"".equals(userMessage.get("socUser")) && userMessage.get("socUser") !=null && !"".equals(userMessage.get("socUser"))){ + if(!"".equals(userMessage.get("socUser")) && userMessage.get("socUser") !=null && userMessage.get("socProtect") !=null && !"0".equals(userMessage.get("socProtect").toString())){ number =Integer.parseInt(userMessage.get("socUser").toString()); } //平台