From 28d872c471dac7a1b52f4c2ba15df4c673d8a9e4 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Wed, 12 Jun 2024 14:13:22 +0800
Subject: [PATCH] =?UTF-8?q?update=20=20=E5=AE=81=E5=A4=8F=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0Service?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsowell/thirdparty/common/CommonService.java    | 3 ++-
 .../platform/service/impl/NinaXiaPlatformServiceImpl.java    | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
index c85641be6..eee4009b1 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/common/CommonService.java
@@ -387,8 +387,9 @@ public class CommonService {
                     // 充电状态, 查出订单信息
                     OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode);
                     if (orderInfo == null) {
-                        return;
+                        continue;
                     }
+                    log.info("宁夏平台推送充电状态信息 params:{}", JSONObject.toJSONString(orderInfo));
                     String result2 = ninaXiaPlatformService.notificationEquipChargeStatus(orderInfo.getOrderCode());
                     log.info("宁夏平台推送充电状态信息 result:{}", result2);
                 }
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java
index 65980e5e8..9b854a8fa 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/NinaXiaPlatformServiceImpl.java
@@ -624,12 +624,15 @@ public class NinaXiaPlatformServiceImpl implements ThirdPartyPlatformService {
                 .pushTimeStamp(dateTimeNow)
                 .connectorStatus(connectorInfo.getStatus())
                 .currentA(connectorInfo.getCurrent())
-                .soc(new BigDecimal(connectorInfo.getSOC()))
+                .soc(new BigDecimal(Constants.ZERO))
                 .startTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderInfo.getChargeStartTime()))
                 .endTime(dateTimeNow)
                 .totalPower(connectorInfo.getInstantPower())
 
                 .build();
+        if (StringUtils.isNotBlank(connectorInfo.getSOC())) {
+            supEquipChargeStatusInfo.setSoc(new BigDecimal(connectorInfo.getSOC()));
+        }
 
 
         String url = urlAddress + "supervise_notification_equip_charge_status";