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 @@
+
+
@@ -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 @@
order_amount,
+
+ virtual_amount,
+
+
+ settle_amount,
+
charge_start_time,
@@ -499,6 +509,12 @@
order_amount = #{orderAmount},
+
+ virtual_amount = #{virtualAmount},
+
+
+ settle_amount = #{settleAmount},
+
charge_start_time = #{chargeStartTime},
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 @@
-
+
+
+