From 65fcdb20418161cce11d34a468c3bba13c68e850 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Thu, 2 Jan 2025 14:05:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=E6=94=BE=E5=87=BA=E5=88=86?=
 =?UTF-8?q?=E6=B6=A6=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jsowell-ui/src/views/pile/station/detail.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsowell-ui/src/views/pile/station/detail.vue b/jsowell-ui/src/views/pile/station/detail.vue
index a50e56d0e..412bae4ae 100644
--- a/jsowell-ui/src/views/pile/station/detail.vue
+++ b/jsowell-ui/src/views/pile/station/detail.vue
@@ -220,9 +220,9 @@
         <order-report ref="orderReport"></order-report>
       </el-tab-pane>
 
-      <!-- <el-tab-pane label="分润配置" name="Config">
+       <el-tab-pane label="分润配置" name="Config">
         <Config ref="orderReport"></Config>
-      </el-tab-pane> -->
+      </el-tab-pane>
     </el-tabs>
 
     <el-dialog :title="dialogTitle" :visible.sync="dialogFormVisible">

From a97b65b66cdd781c792009c7b7f682e1f8f749b3 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 2 Jan 2025 14:07:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update=20=E5=B9=BF=E8=A5=BF=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0Service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/service/impl/GuangXiPlatformServiceImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
index 3198e4b99..def8fa1fe 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuangXiPlatformServiceImpl.java
@@ -643,9 +643,9 @@ public class GuangXiPlatformServiceImpl implements ThirdPartyPlatformService {
             // 充电完成
             orderStatus = "4";
         }
-        BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : info.getCurrent();
-        BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : info.getVoltage();
-        String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : info.getSOC();
+        BigDecimal current = realTimeMonitorData.getOutputCurrent() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputCurrent());
+        BigDecimal voltage = realTimeMonitorData.getOutputVoltage() == null ? BigDecimal.ZERO : new BigDecimal(realTimeMonitorData.getOutputVoltage());
+        String soc = realTimeMonitorData.getSOC() == null ? Constants.ZERO : realTimeMonitorData.getSOC();
 
         String dateTime = DateUtils.getDateTime();
         // 拼装订单编号