From 661b1906dd235f5a1c6f3cf410c334c688acfe99 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Fri, 26 Jan 2024 09:24:59 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0=E4=BC=98=E6=83=A0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jsowell/pile/vo/web/OrderListVO.java | 6 ++++++ .../src/main/resources/mapper/pile/OrderBasicInfoMapper.xml | 1 + 2 files changed, 7 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 521811952..e2ca5aa64 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 @@ -230,6 +230,12 @@ public class OrderListVO { @Excel(name = "虚拟金额") private String virtualAmount; + /** + * 优惠金额 + */ + @Excel(name = "优惠金额") + private String discountAmount; + /** * 结算金额 */ diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 11bf9d5c1..ab09f4d8b 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -1636,6 +1636,7 @@ t1.pay_time as payTime, t1.order_amount as orderAmount, t1.virtual_amount as virtualAmount, + t1.discount_amount as discountAmount, t1.settle_amount as settleAmount, t1.settlement_time as settlementTime, t1.start_soc as startSoc,