From 5f08a316b69d293e3d34d05f8a17bc2ace9c0793 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Wed, 24 May 2023 11:19:16 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E5=90=8E=E7=AE=A1=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsowell/pile/vo/web/OrderListVO.java | 12 ++++++++++++ .../resources/mapper/pile/OrderBasicInfoMapper.xml | 2 ++ 2 files changed, 14 insertions(+) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index cd2b88893..819a086e1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -150,6 +150,18 @@ public class OrderListVO { @Excel(name = "订单金额") private String orderAmount; + /** + * 虚拟金额 + */ + @Excel(name = "虚拟金额") + private String virtualAmount; + + /** + * 结算金额 + */ + @Excel(name = "结算金额") + private String settleAmount; + /** * 创建日期 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 694afc240..364c3cfa1 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -171,6 +171,8 @@ t1.pay_status as payStatus, t1.pay_amount as payAmount, t1.order_amount as orderAmount, + t1.virtual_amount as virtualAmount, + t1.settle_amount as settleAmount, t1.start_soc as startSoc, t1.end_soc as endSoc, t1.charge_start_time as chargeStartTime,