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";