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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-03-15 14:32:12 +08:00
parent 43c567f7f0
commit 00eab8f6b0
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -468,15 +468,12 @@ public class OrderService {
for (OrderVO orderVO : pageInfo.getList()) { for (OrderVO orderVO : pageInfo.getList()) {
orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode()); orderVO.setPileConnectorCode(orderVO.getPileSn() + orderVO.getConnectorCode());
Date endTimeDate; if (orderVO.getStartTime() != null && orderVO.getEndTime() != null) {
Date startTimeDate = sdf.parse(orderVO.getStartTime()); Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
if (StringUtils.isNotBlank(orderVO.getEndTime())) { Date endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
endTimeDate = sdf.parse(orderVO.getEndTime()); // 计算出两个时间差
} else { orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate));
endTimeDate = new Date();
} }
// 计算出两个时间差
orderVO.setChargingTime(DateUtils.getDatePoor(endTimeDate, startTimeDate));
} }
// 返回结果集 // 返回结果集

4
jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
View File

@@ -700,8 +700,8 @@
t1.order_amount as orderAmount, t1.order_amount as orderAmount,
t1.pay_amount as payAmount, t1.pay_amount as payAmount,
t2.total_used_electricity as chargingDegree, t2.total_used_electricity as chargingDegree,
t2.create_time as startTime, t1.charge_start_time as startTime,
t2.update_time as endTime t1.charge_end_time as endTime
from order_basic_info t1 from order_basic_info t1
join order_detail t2 on t1.order_code = t2.order_code join order_detail t2 on t1.order_code = t2.order_code
join pile_station_info t3 on t1.station_id = t3.id join pile_station_info t3 on t1.station_id = t3.id