From 40201906edc3fb80f4842c328120dda2d7aa1d3e Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Mon, 13 Dec 2021 10:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=90=AF=E5=8A=A8SOC=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/XhpcChargeOrderServiceImpl.java      | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 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 e03016a6..74209510 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
@@ -463,11 +463,32 @@ public class XhpcChargeOrderServiceImpl implements IXhpcChargeOrderService {
         }
 
 
+        //桩、平台（最小的）
+        int number =0;
+
         //平台
         String soc = redisService.getCacheObject("global:SOC");
+        if(!"".equals(soc) && soc!=null){
+            if(number!=0){
+                if(Integer.parseInt(soc)-number<0){
+                    number=Integer.parseInt(soc);
+                }
+            }else{
+                number=Integer.parseInt(soc);
+            }
+        }
+        Map<String, Object> operatorMessage = xhpcChargeOrderMapper.getOperatorMessage(xhpcTerminal.getChargingStationId());
+        if(operatorMessage !=null && operatorMessage.get("soc") !=null && !"".equals(operatorMessage.get("soc"))){
+            if(number!=0){
+                if(Integer.parseInt(operatorMessage.get("soc").toString())-number<0){
+                    number=Integer.parseInt(operatorMessage.get("soc").toString());
+                }
+            }else{
+                number=Integer.parseInt(operatorMessage.get("soc").toString());
+            }
 
-
-        startChargingData.setSoc(Integer.parseInt(soc));
+        }
+        startChargingData.setSoc(number);
         logger.info("<<<<<<<<<<<<<<<<<<<<<<<<number>>>>>>>>>>>>>>>>>:" + soc);
         logger.info("<<<<<<<<<<<<<<<<<<<<<<<<Soc>>>>>>>>>>>>>>>>>:" + startChargingData.getSoc());