From f31dc8dfe7b18553875b06e9af8fb846325bc4d5 Mon Sep 17 00:00:00 2001 From: Lemon Date: Thu, 31 Aug 2023 11:21:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=20=E6=B7=BB=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 1 + .../main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java | 1 + jsowell-ui/src/views/order/order/orderDetail.vue | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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 df68f2500..768eb5a61 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -371,6 +371,7 @@ public class OrderService { order.setStopReasonMsg(orderBasicInfo.getReason()); order.setStartSOC(orderBasicInfo.getStartSOC()); order.setEndSOC(orderBasicInfo.getEndSOC()); + order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); vo.setOrderInfo(order); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java index 7dcf34e23..55b97fa89 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java @@ -58,6 +58,7 @@ public class OrderDetailInfoVO { private String createTime; // 订单创建时间 private String startSOC; // 开始SOC private String endSOC; // 结束SOC + private String settleAmount;// 结算金额 private String settlementTime; // 结算时间 } diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index ce7b020d8..252687a1d 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -85,8 +85,8 @@ + -