From 8e5c193e775df9ab78fe6e06849e4ed9cd787cbf Mon Sep 17 00:00:00 2001 From: "YAS\\29473" <2947326429@qq.com> Date: Mon, 10 Nov 2025 09:35:12 +0800 Subject: [PATCH] update --- .../service/impl/ChangZhouPlatformServiceImpl.java | 5 ++++- .../platform/service/impl/GuiZhouPlatformServiceImpl.java | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java index f6ee505ba..bde2219d4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ChangZhouPlatformServiceImpl.java @@ -808,13 +808,16 @@ public class ChangZhouPlatformServiceImpl implements ThirdPartyPlatformService { List chargeDetails = transformSupChargeDetails(orderDetail, billingList); + BigDecimal totalElectricityAmount = orderDetail.getTotalElectricityAmount() + == null ? BigDecimal.ZERO : orderDetail.getTotalElectricityAmount().setScale(2 , BigDecimal.ROUND_HALF_UP); + JSONObject json = new JSONObject(); json.put("StartChargeSeq", orderCode); json.put("ConnectorID", orderBasicInfo.getPileConnectorCode()); json.put("StartTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeStartTime)); json.put("EndTime", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, chargeEndTime)); json.put("TotalPower", orderDetail.getTotalUsedElectricity().setScale(2, BigDecimal.ROUND_HALF_UP)); - json.put("TotalElecMoney", orderDetail.getTotalElectricityAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); + json.put("TotalElecMoney", totalElectricityAmount); json.put("TotalSeviceMoney", orderDetail.getTotalServiceAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("TotalMoney", orderDetail.getTotalOrderAmount().setScale(2, BigDecimal.ROUND_HALF_UP)); json.put("StopReason", 2); // 2：BMS 停止充电 diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java index bc1db513d..15e8657f6 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/GuiZhouPlatformServiceImpl.java @@ -581,9 +581,9 @@ public class GuiZhouPlatformServiceImpl 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(); SupEquipChargeStatusInfo supEquipChargeStatusInfo = SupEquipChargeStatusInfo.builder() @@ -596,7 +596,7 @@ public class GuiZhouPlatformServiceImpl implements ThirdPartyPlatformService { .orderStatus(Integer.parseInt(orderStatus)) .equipmentClassification(Constants.one) .pushTimeStamp(dateTime) - .connectorStatus(Integer.parseInt(realTimeMonitorData.getConnectorStatus())) // 3-充电中 + .connectorStatus(3) // 3-充电中 .currentA(current.setScale(1, RoundingMode.HALF_UP)) .voltageA(voltage.setScale(1, RoundingMode.HALF_UP)) .soc(new BigDecimal(soc))