From 8bb6b3530b00c9f7b226377639a423321fa9e114 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Fri, 29 Nov 2024 10:52:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=AE=A2=E5=8D=95=E6=B6=88?= =?UTF-8?q?=E8=B4=B9=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/service/OrderService.java | 1 + .../src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java | 1 + 2 files changed, 2 insertions(+) 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 6f15e2f76..4db3f7cbc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -425,6 +425,7 @@ public class OrderService { order.setStopReasonMsg(orderBasicInfo.getReason()); order.setStartSOC(orderBasicInfo.getStartSoc()); order.setEndSOC(orderBasicInfo.getEndSoc()); + order.setOrderAmount(String.valueOf(orderBasicInfo.getOrderAmount())); order.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount())); order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); 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 a3af8d280..2169a264c 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 @@ -66,6 +66,7 @@ public class OrderDetailInfoVO { private String createTime; // 订单创建时间 private String startSOC; // 开始SOC private String endSOC; // 结束SOC + private String orderAmount; // 订单消费金额 private String discountAmount; // 订单优惠金额 private String settleAmount;// 结算金额 private String settlementTime; // 结算时间