From 18e4c8229916bc1f569250ca9c04df2525e1c265 Mon Sep 17 00:00:00 2001 From: Lemon Date: Tue, 11 Nov 2025 08:55:46 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=20=20=E4=BA=BA=E5=B7=A5=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E8=AE=A2=E5=8D=95=E7=A9=BA=E6=8C=87=E9=92=88=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index ee3fb5ecb..2167eed08 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -807,20 +807,36 @@ public class OrderService { // 如果订单的交易记录为空 if (data == null) { data = new TransactionRecordsData(); - // TODO 以前端传的值为准，如果没有传值则查最后一次实时数据 - if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) { - // 获取最后一次实时数据 - List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); - if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { - RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); - chargingAmount = realTimeMonitorData.getChargingAmount(); - chargingDegree = realTimeMonitorData.getChargingDegree(); - - data.setConsumptionAmount(chargingAmount); // 总消费金额 - data.setTotalElectricity(chargingDegree); // 总用电量 - data.setStopReasonMsg("人工结算订单，操作人:" + SecurityUtils.getUsername()); // 停止原因 - } + // 获取最后一次实时数据 + List chargingRealTimeData = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); + // if (CollectionUtils.isEmpty(chargingRealTimeData)) { + // log.error("人工结算订单 最后一次实时数据为空 error"); + // return false; + // } + // RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); + // 以前端传的值为准，如果没有传值则查最后一次实时数据 + if (StringUtils.equals(chargingAmount, Constants.ZERO) && CollectionUtils.isNotEmpty(chargingRealTimeData)) { + chargingAmount = chargingRealTimeData.get(0).getChargingAmount(); } + if (StringUtils.equals(chargingDegree, Constants.ZERO) && CollectionUtils.isNotEmpty(chargingRealTimeData)) { + chargingDegree = chargingRealTimeData.get(0).getChargingDegree(); + } + data.setConsumptionAmount(chargingAmount); // 总消费金额 + data.setTotalElectricity(chargingDegree); // 总用电量 + data.setStopReasonMsg("人工结算订单，操作人:" + SecurityUtils.getUsername()); // 停止原因 + + // if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) { + // + // if (CollectionUtils.isNotEmpty(chargingRealTimeData)) { + // RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0); + // chargingAmount = realTimeMonitorData.getChargingAmount(); + // chargingDegree = realTimeMonitorData.getChargingDegree(); + // + // data.setConsumptionAmount(chargingAmount); // 总消费金额 + // data.setTotalElectricity(chargingDegree); // 总用电量 + // data.setStopReasonMsg("人工结算订单，操作人:" + SecurityUtils.getUsername()); // 停止原因 + // } + // } } // 查询订单退款记录，如存在退款说明已经结算过，不能再次结算