From f31dc8dfe7b18553875b06e9af8fb846325bc4d5 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 31 Aug 2023 11:21:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update=20=20=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsowell/service/OrderService.java         | 1 +
 .../main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java    | 1 +
 jsowell-ui/src/views/order/order/orderDetail.vue                | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
index df68f2500..768eb5a61 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -371,6 +371,7 @@ public class OrderService {
 		order.setStopReasonMsg(orderBasicInfo.getReason());
 		order.setStartSOC(orderBasicInfo.getStartSOC());
 		order.setEndSOC(orderBasicInfo.getEndSOC());
+		order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
 		order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
 		vo.setOrderInfo(order);
 
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
index 7dcf34e23..55b97fa89 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
@@ -58,6 +58,7 @@ public class OrderDetailInfoVO {
 		private String createTime; // 订单创建时间
 		private String startSOC; // 开始SOC
 		private String endSOC; // 结束SOC
+		private String settleAmount;// 结算金额
 		private String settlementTime; // 结算时间
 	}
 
diff --git a/jsowell-ui/src/views/order/order/orderDetail.vue b/jsowell-ui/src/views/order/order/orderDetail.vue
index ce7b020d8..252687a1d 100644
--- a/jsowell-ui/src/views/order/order/orderDetail.vue
+++ b/jsowell-ui/src/views/order/order/orderDetail.vue
@@ -85,8 +85,8 @@
         <el-table-column prop="startTime" label="充电开始时间" align="center"/>
         <el-table-column prop="endTime" label="充电结束时间" align="center"/>
         <el-table-column prop="createTime" label="订单创建时间" align="center"/>
+        <el-table-column prop="settleAmount" label="订单结算金额" align="center"/>
         <el-table-column prop="settlementTime" label="订单结算时间" align="center"/>
-<!--        <el-table-column prop="settlementTime" label="订单结算金额" align="center"/>-->
         <el-table-column prop="startSOC" label="起始SOC" align="center" width="80"/>
         <el-table-column prop="endSOC" label="终止SOC" align="center" width="80"/>
         <el-table-column prop="stopReasonMsg" label="订单停止原因" align="center" width="100"/>

From 16be76995e97542094d25e4516632615a65b33c2 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Thu, 31 Aug 2023 13:17:31 +0800
Subject: [PATCH 2/2] update

---
 .../src/main/resources/mapper/pile/ClearingBillInfoMapper.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
index 9d78946c5..40090e19c 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
@@ -286,7 +286,7 @@
     from clearing_bill_info t1
       join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0'
     where t1.merchant_id = #{merchantId,jdbcType=VARCHAR}
-    and t1.create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    and t1.trade_date between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
     order by
      t1.trade_date desc
   </select>