autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-07 23:48:05 +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:
Lemon
2024-05-30 13:52:28 +08:00
parent 0719a13108 e125c4c132
commit b3f847dba3
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3054,7 +3054,7 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
} else if (StartModeEnum.VIN_CODE.getValue().equals(dto.getStartMode())) { } else if (StartModeEnum.VIN_CODE.getValue().equals(dto.getStartMode())) {
sendStartCharging = false; sendStartCharging = false;
} else if (StartTypeEnum.RESERVED.getValue().equals(orderInfo.getStartType())) { } else if (StartTypeEnum.RESERVED.getValue().equals(orderInfo.getStartType())) {
// sendStartCharging = false; sendStartCharging = false;
} else if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) { } else if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {
sendStartCharging = false; sendStartCharging = false;
} }
@@ -3120,13 +3120,9 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
.reservedStartTime(orderInfo.getReservedEndTime()) .reservedStartTime(orderInfo.getReservedEndTime())
.amount(new BigDecimal(Constants.FIVE_HUNDRED)) .amount(new BigDecimal(Constants.FIVE_HUNDRED))
.build(); .build();
CompletableFuture.runAsync(() -> { // 发送预约充电指令
try {
pileRemoteService.reservedCharging(command); pileRemoteService.reservedCharging(command);
} catch (Exception e) { logger.info("订单:{}支付成功, 发送预约充电指令", dto.getOrderCode());
logger.error("异步发送预约充电指令, orderCode:{}", orderInfo.getOrderCode(), e);
}
});
} }
if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) { if (OrderStatusEnum.STAY_RETROACTIVE_AMOUNT.getValue().equals(orderInfo.getOrderStatus())) {