From 1790bd9b37228e2b7725d39fd8e296611c2e1fe5 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Tue, 22 Aug 2023 15:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5up?= =?UTF-8?q?date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jsowell/service/OrderService.java | 1 + .../pile/vo/web/OrderDetailInfoVO.java | 14 +++++++++++++ .../src/views/order/order/orderDetail.vue | 20 ++++++++++--------- 3 files changed, 26 insertions(+), 9 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 b936b21e4..c8c6e064c 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -363,6 +363,7 @@ public class OrderService { order.setStopReasonMsg(orderBasicInfo.getReason()); order.setStartSOC(orderBasicInfo.getStartSOC()); order.setEndSOC(orderBasicInfo.getEndSOC()); + 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 16f55406a..46321da75 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 @@ -41,6 +41,9 @@ public class OrderDetailInfoVO { // 收费明细 private List chargeDetails; + + // 结算信息 + private SettlementInfo settlementInfo; @Data public static class OrderInfo { @@ -55,6 +58,7 @@ public class OrderDetailInfoVO { private String createTime; // 订单创建时间 private String startSOC; // 开始SOC private String endSOC; // 结束SOC + private String settlementTime; // 结算时间 } @Data @@ -96,4 +100,14 @@ public class OrderDetailInfoVO { private String createdTime; // 退款创建时间 private String succeedTime; // 退款成功时间 } + + @Data + public static class SettlementInfo { + private String payAmount; // 支付金额 + private String payTime; // 支付时间 + private String refundAmount; // 退款金额 + private String refundTime; // 退款时间 + private String settlementTime; // 结算时间 + private String settlementAmount; // 结算金额 + } } diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue index 1befbe174..1ef3365f9 100644 --- a/jsowell-ui/src/views/order/order/orderDetail.vue +++ b/jsowell-ui/src/views/order/order/orderDetail.vue @@ -78,16 +78,18 @@

订单信息

- + - - - - - - - - + + + + + + + + + +