From e62a9a1f852c0d7d343eb1c23431b86e05a398f8 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 6 Mar 2024 13:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 2 ++ .../pile/service/programlogic/AbstractProgramLogic.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 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 65bfe5d43..f8502d85d 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -700,7 +700,9 @@ public class OrderService { // return false; // } + // 充电金额 String chargingAmount = dto.getChargingAmount(); + // 充电度数 String chargingDegree = dto.getChargingDegree(); if (StringUtils.equals(chargingAmount, Constants.ZERO) || StringUtils.equals(chargingDegree, Constants.ZERO)) { // 获取最后一次实时数据 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 25ed21a3f..9805a1986 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -403,8 +403,10 @@ public abstract class AbstractProgramLogic implements InitializingBean { orderDetail.setTotalElectricityAmount(totalElectricityAmount); // 服务费总金额 orderDetail.setTotalServiceAmount(totalServiceAmount); - orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); // 总用电量 - orderDetail.setTotalOrderAmount(orderAmount); // 订单总金额 + // 总用电量 + orderDetail.setTotalUsedElectricity(new BigDecimal(data.getTotalElectricity())); + // 订单总金额 + orderDetail.setTotalOrderAmount(orderAmount); } catch (Exception e) { logger.error("设置订单详情参数发生异常", e); }