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

update 电单车

Browse Source
This commit is contained in:
Guoqs
2024-09-20 13:57:41 +08:00
parent 931e559bb0
commit dbc037727e
3 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -253,7 +253,7 @@ public class OrderService {
if (StringUtils.isBlank(orderStatus)) {
throw new BusinessException(ReturnCodeEnum.CODE_PARAM_NOT_NULL_ERROR);
}
ArrayList<String> orderStatusList = Lists.newArrayList();
List<String> orderStatusList = Lists.newArrayList();
if (StringUtils.equals("2", orderStatus)) {
// 查未完成订单
CollectionUtils.addAll(orderStatusList, "0", "1", "2", "3", "4", "5");
@@ -281,27 +281,19 @@ public class OrderService {
}
RealTimeMonitorData realTimeMonitorData = chargingRealTimeData.get(0);
String sumChargingTime = realTimeMonitorData.getSumChargingTime(); // xx分钟
if (StringUtils.isNotBlank(orderVO.getStartTime())) {
// 开始时间不为空, 根据开始充电时间计算充电时长
sumChargingTime = String.valueOf(DateUtils.minutesSince(orderVO.getStartTime()));
}
String chargingTime = "-";
try {
// 分钟转成 x时x分
chargingTime = DateUtils.convertMinutesToTime(Integer.parseInt(sumChargingTime));
} catch (Exception e) {
orderVO.setChargingTime(sumChargingTime);
continue;
log.error("转换充电时间error, sumChargingTime:{}", sumChargingTime);
}
// String chargingTime = "0分钟";
// if (orderVO.getStartTime() != null) {
// Date startTimeDate = DateUtils.parseDate(orderVO.getStartTime());
// Date endTimeDate;
// if (orderVO.getEndTime() != null) {
// endTimeDate = DateUtils.parseDate(orderVO.getEndTime());
// // 计算出两个时间差
// chargingTime = DateUtils.getDatePoor(endTimeDate, startTimeDate);
// } else {
// endTimeDate = new Date();
// }
//
// }
orderVO.setChargingTime(chargingTime);
}