From 08230095cb64082bcde81e210bb28d5b97de1e8a Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 14 Apr 2023 08:39:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=8D=E5=8F=82=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20=E8=AE=A2=E5=8D=95=E6=80=BB=E7=94=B5=E8=B4=B9?= =?UTF-8?q?=E9=87=91=E9=A2=9D=20=E8=AE=A2=E5=8D=95=E6=80=BB=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=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/pile/vo/uniapp/OrderVO.java | 4 ++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java index b9fc40895..c10556c23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/OrderVO.java @@ -81,4 +81,8 @@ public class OrderVO { * 充电时长 */ private String chargingTime; + + private BigDecimal totalElectricityAmount; + + private BigDecimal totalServiceAmount; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 727cf810f..2ddaf96cb 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -735,7 +735,9 @@ t1.pay_amount as payAmount, t2.total_used_electricity as chargingDegree, t1.charge_start_time as startTime, - t1.charge_end_time as endTime + t1.charge_end_time as endTime, + t2.total_electricity_amount as totalElectricityAmount, + t2.total_service_amount as totalServiceAmount from order_basic_info t1 join order_detail t2 on t1.order_code = t2.order_code join pile_station_info t3 on t1.station_id = t3.id