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

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-31 14:06:35 +08:00
parent 6e2b769dbb 16be76995e
commit 6b658e5594
4 changed files with 4 additions and 2 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

@@ -372,6 +372,7 @@ public class OrderService {
order.setStopReasonMsg(orderBasicInfo.getReason()); order.setStopReasonMsg(orderBasicInfo.getReason());
order.setStartSOC(orderBasicInfo.getStartSOC()); order.setStartSOC(orderBasicInfo.getStartSOC());
order.setEndSOC(orderBasicInfo.getEndSOC()); order.setEndSOC(orderBasicInfo.getEndSOC());
order.setSettleAmount(String.valueOf(orderBasicInfo.getSettleAmount()));
order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime())); order.setSettlementTime(DateUtils.formatDateTime(orderBasicInfo.getSettlementTime()));
vo.setOrderInfo(order); vo.setOrderInfo(order);

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

@@ -58,6 +58,7 @@ public class OrderDetailInfoVO {
private String createTime; // 订单创建时间 private String createTime; // 订单创建时间
private String startSOC; // 开始SOC private String startSOC; // 开始SOC
private String endSOC; // 结束SOC private String endSOC; // 结束SOC
private String settleAmount;// 结算金额
private String settlementTime; // 结算时间 private String settlementTime; // 结算时间
} }

2
jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
View File

@@ -286,7 +286,7 @@
from clearing_bill_info t1 from clearing_bill_info t1
join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0' join pile_merchant_info t2 on t1.merchant_id = t2.id and t1.del_flag = '0'
where t1.merchant_id = #{merchantId,jdbcType=VARCHAR} 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 order by
t1.trade_date desc t1.trade_date desc
</select> </select>

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

@@ -85,8 +85,8 @@
<el-table-column prop="startTime" label="充电开始时间" align="center"/> <el-table-column prop="startTime" label="充电开始时间" align="center"/>
<el-table-column prop="endTime" label="充电结束时间" align="center"/> <el-table-column prop="endTime" label="充电结束时间" align="center"/>
<el-table-column prop="createTime" 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="settlementTime" label="订单结算金额" align="center"/>-->
<el-table-column prop="startSOC" label="起始SOC" align="center" width="80"/> <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="endSOC" label="终止SOC" align="center" width="80"/>
<el-table-column prop="stopReasonMsg" label="订单停止原因" align="center" width="100"/> <el-table-column prop="stopReasonMsg" label="订单停止原因" align="center" width="100"/>