From 9b08105c5f5c8a3f2d1b2c17ee3e35ac7e63ec0b Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 19 Dec 2024 16:40:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=98=BE=E7=A4=BASOC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrderBasicInfoServiceImpl.java    | 14 ++++++++++++++
 jsowell-ui/src/views/order/order/index.vue         |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
index 529e8bbeb..ba8ef5ca9 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
@@ -312,6 +312,20 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
                 String label = ThirdPlatformTypeEnum.getTypeLabelByTypeCode(thirdPartyType);
                 orderListVO.setThirdPartyType(label + "启动");
             }
+
+            // 设置soc
+            if (StringUtils.isNotBlank(orderListVO.getStartSoc()) || StringUtils.isNotBlank(orderListVO.getEndSoc())) {
+                // 取redis中的soc数据
+                Map<String, String> socMap = YKCUtils.getSOCMap(orderListVO.getTransactionCode());
+                if (Objects.nonNull(socMap)) {
+                    if (StringUtils.isBlank(orderListVO.getStartSoc())) {
+                        orderListVO.setStartSoc(socMap.get("startSoc"));
+                    }
+                    if (StringUtils.isBlank(orderListVO.getEndSoc())) {
+                        orderListVO.setEndSoc(socMap.get("endSoc"));
+                    }
+                }
+            }
         }
 
         batchQueryFeeAmt(orderListVOS);
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index a13192454..bb13a52c3 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -149,7 +149,7 @@
                                 </el-descriptions-item>
                                 <el-descriptions-item label="起始SOC">{{ item.startSoc }}
                                 </el-descriptions-item>
-                                <el-descriptions-item label="终止SOC">{{ item.endSoc }}
+                                <el-descriptions-item label="当前SOC">{{ item.endSoc }}
                                 </el-descriptions-item>
                                 <el-descriptions-item label="结束充电时间">{{ item.chargeEndTime }}
                                 </el-descriptions-item>