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

update

Browse Source
This commit is contained in:
Guoqs
2024-07-24 13:57:13 +08:00
parent 67f973ac9b
commit 5a58d6e22c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -577,6 +577,9 @@ public class OrderService {
vo.setPileConnectorCode(pileSn + connectorCode); vo.setPileConnectorCode(pileSn + connectorCode);
String orderStatus = orderBasicInfo.getOrderStatus(); String orderStatus = orderBasicInfo.getOrderStatus();
vo.setOrderStatus(orderStatus); vo.setOrderStatus(orderStatus);
// 订单状态描述
String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
vo.setOrderStatusDescribe(orderStatusDescribe);
if (Objects.nonNull(orderBasicInfo.getChargeStartTime())) { if (Objects.nonNull(orderBasicInfo.getChargeStartTime())) {
vo.setStartChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime())); vo.setStartChargingTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, orderBasicInfo.getChargeStartTime()));
} }
@@ -597,9 +600,6 @@ public class OrderService {
if (StringUtils.isNotBlank(String.valueOf(stationInfo.getOccupyFee()))) { if (StringUtils.isNotBlank(String.valueOf(stationInfo.getOccupyFee()))) {
vo.setOccupyFee(stationInfo.getOccupyFee()); vo.setOccupyFee(stationInfo.getOccupyFee());
} }
// 订单状态描述
String orderStatusDescribe = orderBasicInfoService.transformOrderStatusDescribe(orderStatus, orderBasicInfo.getPayStatus());
vo.setOrderStatusDescribe(orderStatusDescribe);
// 获取充电桩枪口信息 // 获取充电桩枪口信息
PileConnectorDetailVO pileConnectorDetailVO = pileService.queryPileConnectorDetail(vo.getPileConnectorCode()); PileConnectorDetailVO pileConnectorDetailVO = pileService.queryPileConnectorDetail(vo.getPileConnectorCode());