autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-04 18:10:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单详情页update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-22 15:57:39 +08:00
parent 43f26cd860
commit 1790bd9b37
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -363,6 +363,7 @@ public class OrderService {
order.setStopReasonMsg(orderBasicInfo.getReason());
order.setStartSOC(orderBasicInfo.getStartSOC());
order.setEndSOC(orderBasicInfo.getEndSOC());
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
vo.setOrderInfo(order);
// 设备信息

14
jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderDetailInfoVO.java
View File

@@ -41,6 +41,9 @@ public class OrderDetailInfoVO {
// 收费明细
private List<OrderPeriodAmountVO> chargeDetails;
// 结算信息
private SettlementInfo settlementInfo;
@Data
public static class OrderInfo {
@@ -55,6 +58,7 @@ public class OrderDetailInfoVO {
private String createTime; // 订单创建时间
private String startSOC; // 开始SOC
private String endSOC; // 结束SOC
private String settlementTime; // 结算时间
}
@Data
@@ -96,4 +100,14 @@ public class OrderDetailInfoVO {
private String createdTime; // 退款创建时间
private String succeedTime; // 退款成功时间
}
@Data
public static class SettlementInfo {
private String payAmount; // 支付金额
private String payTime; // 支付时间
private String refundAmount; // 退款金额
private String refundTime; // 退款时间
private String settlementTime; // 结算时间
private String settlementAmount; // 结算金额
}
}

20
jsowell-ui/src/views/order/order/orderDetail.vue
View File

@@ -78,16 +78,18 @@
<el-card class="cardStyle">
<h3>订单信息</h3>
<el-table style="width: 100%" :data="orderInfo" border>
<el-table-column prop="orderCode" label="订单号" align="center" width="280"/>
<el-table-column prop="orderCode" label="订单号" align="center" width="120"/>
<el-table-column prop="transactionCode" label="交易流水号" align="center" width="280"/>
<el-table-column prop="logicCard" label="卡号" align="center" width="280"/>
<el-table-column prop="orderStatusDescribe" label="订单状态描述" align="center"/>
<el-table-column prop="createTime" label="创建时间" align="center"/>
<el-table-column prop="startTime" label="开始时间" align="center"/>
<el-table-column prop="endTime" label="结束时间" align="center"/>
<el-table-column prop="startSOC" label="起始SOC" align="center"/>
<el-table-column prop="endSOC" label="终止SOC" align="center"/>
<el-table-column prop="stopReasonMsg" label="订单停止原因" align="center"/>
<el-table-column prop="logicCard" label="卡号" align="center" width="80"/>
<el-table-column prop="orderStatusDescribe" label="订单状态描述" align="center" width="100"/>
<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="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"/>
</el-table>
<div class="marginTop"></div>
</el-card>