From 9565d465fadf32e61dbcfcd582d9128be18c2c36 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 24 May 2023 10:25:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=BB=E8=A1=A8=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=99=9A=E6=8B=9F=E9=87=91=E9=A2=9D=E5=92=8C=E7=BB=93?=
 =?UTF-8?q?=E7=AE=97=E9=87=91=E9=A2=9D=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/domain/OrderBasicInfo.java  | 14 +++++++++++++-
 .../mapper/pile/OrderBasicInfoMapper.xml         | 16 ++++++++++++++++
 jsowell-ui/src/views/order/order/index.vue       |  4 +++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
index e637842b3..a18b2bc00 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java
@@ -123,9 +123,21 @@ public class OrderBasicInfo extends BaseEntity {
 	/**
 	 * 订单总金额 = 电费总金额 + 服务费总金额
 	 */
-	@Excel(name = "订单总金额 = 电费总金额 + 服务费总金额")
+	@Excel(name = "订单总金额")
 	private BigDecimal orderAmount;
 
+	/**
+	 * 虚拟金额
+	 */
+	@Excel(name = "虚拟金额")
+	private BigDecimal virtualAmount;
+
+	/**
+	 * 结算金额
+	 */
+	@Excel(name = "结算金额")
+	private BigDecimal settleAmount;
+
 	/**
 	 * 充电开始时间
 	 */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index cf3f18bb0..694afc240 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -20,6 +20,8 @@
         <result property="payAmount" column="pay_amount"/>
         <result property="payTime" column="pay_time"/>
         <result property="orderAmount" column="order_amount"/>
+        <result property="virtualAmount" column="virtual_amount"/>
+        <result property="settleAmount" column="settle_amount"/>
         <result property="chargeStartTime" column="charge_start_time"/>
         <result property="chargeEndTime" column="charge_end_time"/>
         <result property="startType" column="start_type"/>
@@ -98,6 +100,8 @@
         pay_amount,
         pay_time,
         order_amount,
+        virtual_amount,
+        settle_amount,
         charge_start_time,
         charge_end_time,
         start_type,
@@ -320,6 +324,12 @@
             <if test="orderAmount != null">
                 order_amount,
             </if>
+            <if test="virtualAmount != null">
+                virtual_amount,
+            </if>
+            <if test="settleAmount != null">
+                settle_amount,
+            </if>
             <if test="chargeStartTime != null">
                 charge_start_time,
             </if>
@@ -499,6 +509,12 @@
             <if test="orderAmount != null">
                 order_amount = #{orderAmount},
             </if>
+            <if test="virtualAmount != null">
+                virtual_amount = #{virtualAmount},
+            </if>
+            <if test="settleAmount != null">
+                settle_amount = #{settleAmount},
+            </if>
             <if test="chargeStartTime != null">
                 charge_start_time = #{chargeStartTime},
             </if>
diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue
index 4b22d9bd4..693493363 100644
--- a/jsowell-ui/src/views/order/order/index.vue
+++ b/jsowell-ui/src/views/order/order/index.vue
@@ -208,7 +208,9 @@
       <el-table-column label="终止soc" align="center" prop="endSoc" />
       <el-table-column label="开始充电时间" align="center" prop="chargeStartTime" width="180"/>
       <el-table-column label="结束充电时间" align="center" prop="chargeEndTime" width="180"/>
-      <el-table-column label="订单总金额" align="center" prop="orderAmount" width="100px"  fixed="right"/>
+      <el-table-column label="总消费金额" align="center" prop="orderAmount" width="100px"  fixed="right"/>
+      <el-table-column label="虚拟金额" align="center" prop="orderAmount" width="100px"  fixed="right"/>
+      <el-table-column label="对账金额" align="center" prop="orderAmount" width="100px"  fixed="right"/>
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button