autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-29 19:47:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 后管订单详情页面中 实时订单数据添加字段

Browse Source
This commit is contained in:
Lemon
2023-08-31 10:29:17 +08:00
parent 8bfd87232c
commit 73b203dd44
5 changed files with 9 additions and 7 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

@@ -401,6 +401,7 @@ public class OrderService {
realTimeInfo.setOrderAmount(realTimeMonitorData.getChargingAmount()); realTimeInfo.setOrderAmount(realTimeMonitorData.getChargingAmount());
realTimeInfo.setChargedDegree(realTimeMonitorData.getChargingDegree()); realTimeInfo.setChargedDegree(realTimeMonitorData.getChargingDegree());
realTimeInfo.setChargingTime(realTimeMonitorData.getSumChargingTime()); realTimeInfo.setChargingTime(realTimeMonitorData.getSumChargingTime());
realTimeInfo.setTime(realTimeMonitorData.getDateTime());
vo.setOrderRealTimeInfo(realTimeInfo); vo.setOrderRealTimeInfo(realTimeInfo);
// 根据时间进行正序排序 // 根据时间进行正序排序

12
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -441,14 +441,14 @@ public class SpringBootTestController {
@Test @Test
public void createSettleAccountRequestTest() throws BaseAdaPayException { public void createSettleAccountRequestTest() throws BaseAdaPayException {
SettleAccountDTO dto = new SettleAccountDTO(); SettleAccountDTO dto = new SettleAccountDTO();
dto.setCardId("10534201040009200"); dto.setCardId("408060100100034609");
dto.setCardName("苏州远慧物联智能科技有限公司"); dto.setCardName("江苏敦顺建设工程有限公司");
dto.setTelNo("13915742562"); dto.setTelNo("18021373333");
dto.setBankCode("01030000"); dto.setBankCode("03090000");
dto.setBankAcctType("1"); dto.setBankAcctType("1");
dto.setProvCode("0032"); dto.setProvCode("0032");
dto.setAreaCode("3206"); dto.setAreaCode("3210");
String adapayMemberId = "ACM48720983"; String adapayMemberId = "ACM40991242";
String wechatAppId = "wxbb3e0d474569481d"; String wechatAppId = "wxbb3e0d474569481d";
adapayService.createSettleAccountRequest(dto, adapayMemberId, wechatAppId); adapayService.createSettleAccountRequest(dto, adapayMemberId, wechatAppId);
} }

1
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -1187,7 +1187,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList); List<Map<String, Object>> list = calculateUnfreezeAmount(orderAmount, payRecordList);
for (Map<String, Object> map : list) { for (Map<String, Object> map : list) {
String paymentId = (String) map.get("paymentId"); String paymentId = (String) map.get("paymentId");
// String unfreezeAmount = (String) map.get("unfreezeAmount");
BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount"); BigDecimal unfreezeAmount = (BigDecimal) map.get("unfreezeAmount");
memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount); memberAdapayRecordService.unfreezeAmount(paymentId, unfreezeAmount);
} }

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

@@ -84,6 +84,7 @@ public class OrderDetailInfoVO {
@Data @Data
public static class OrderRealTimeInfo{ public static class OrderRealTimeInfo{
private String time;
private String orderAmount; // 订单金额 private String orderAmount; // 订单金额
private String totalElectricityAmount; // 总电费 private String totalElectricityAmount; // 总电费
private String totalServiceAmount; // 总服务费 private String totalServiceAmount; // 总服务费

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

@@ -110,6 +110,7 @@
<el-card class="cardStyle"> <el-card class="cardStyle">
<h3>实时订单数据</h3> <h3>实时订单数据</h3>
<el-table style="width: 100%" :data="orderRealTimeInfo" border> <el-table style="width: 100%" :data="orderRealTimeInfo" border>
<el-table-column prop="time" label="时间" align="center"/>
<el-table-column prop="orderAmount" label="消费金额" align="center" width="280"> <el-table-column prop="orderAmount" label="消费金额" align="center" width="280">
<template slot-scope="scope"> <template slot-scope="scope">
<span>￥{{ <span>￥{{