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 125e41d19..a130e2422 100644
--- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
+++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
@@ -372,6 +372,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-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
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 @@
+
-