From 3979f9af5d24cfbfe9a2011523cd3513ea1bbe1e Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 11 Mar 2022 17:01:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=AF=E5=8A=A8=E5=85=85?=
 =?UTF-8?q?=E7=94=B5=EF=BC=8C=E4=B8=8B=E5=8F=91SOC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xhpc/order/service/impl/XhpcChargeOrderServiceImpl.java  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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());
             }
             //平台