From b89901aa8daf7614c971d97a33927ce4055a5877 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 19 Feb 2024 15:25:56 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=8A=A0=E5=B1=95=E7=A4=BA=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jsowell/service/OrderService.java | 5 +++++ .../java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java | 10 ++++++++++ 2 files changed, 15 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 8c59ce495..7b8e0329e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -567,6 +567,11 @@ public class OrderService { vo.setPileConnectorStatus(pileConnectorDetailVO.getConnectorStatus()); } + // 优惠金额 + vo.setDiscountAmount(String.valueOf(orderBasicInfo.getDiscountAmount())); + // 实付金额 + vo.setActualAmount(String.valueOf(orderBasicInfo.getOrderAmount().subtract(orderBasicInfo.getDiscountAmount()))); + // 获取订单充电数据 List monitorDataList = orderBasicInfoService.getChargingRealTimeData(orderBasicInfo.getTransactionCode()); if (CollectionUtils.isNotEmpty(monitorDataList)) { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java index f6c8df5ee..474cd6bbd 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/UniAppOrderVO.java @@ -69,6 +69,16 @@ public class UniAppOrderVO { */ private String orderAmount; + /** + * 优惠金额 + */ + private String discountAmount; + + /** + * 实付金额 + */ + private String actualAmount; + /** * 当前SOC */