diff --git a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java index 7c980424b..0809c77c9 100644 --- a/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java +++ b/jsowell-netty/src/main/java/com/jsowell/netty/handler/yunkuaichong/RemoteStartChargingRequestHandler.java @@ -95,6 +95,7 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { String failedReason = BytesUtil.bin2HexStr(failedReasonByteArr); String failedReasonMsg = ChargingFailedReasonEnum.getMsgByCode(Integer.parseInt(failedReason, 16)); + log.info("远程启动充电命令回复-交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果(00-失败, 01-成功):{}, 失败原因:{}", transactionCode, pileSn, connectorCode, startResult, failedReasonMsg); if (StringUtils.equals(startResult, Constants.DOUBLE_ZERO)) { // 启动失败 2025年4月2日16点39分修改逻辑:启动失败后不退款, 使用支付完成未启动定时任务退款 // orderBasicInfoService.chargingPileFailedToStart(transactionCode, failedReasonMsg); @@ -102,8 +103,6 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { // 启动成功 orderBasicInfoService.chargingPileStartedSuccessfully(transactionCode); } - // orderBasicInfoService.updateOrderBasicInfo(orderInfo); - log.info("远程启动充电命令回复-交易流水号:{}, 桩编码:{}, 枪号:{}, 启动结果(00-失败, 01-成功):{}, 失败原因:{}", transactionCode, pileSn, connectorCode, startResult, failedReasonMsg); // 异步推送第三方平台 CompletableFuture.runAsync(() -> { OrderBasicInfo orderInfo = orderBasicInfoService.getOrderInfoByTransactionCode(transactionCode); @@ -112,7 +111,6 @@ public class RemoteStartChargingRequestHandler extends AbstractYkcHandler { } try { // 启动结果回复 -// commonService.commonPushStartChargeResult(orderInfo); commonService.commonPushStartChargeResultV2(orderInfo); } catch (Exception e) { e.printStackTrace(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 11f0e2b90..3fe015b77 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -697,8 +697,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { // 获取订单的实时检测数据,有实时数据说明充电了,没有实时数据说明桩确实没有充电 List chargingRealTimeData = getChargingRealTimeData(orderBasicInfo.getTransactionCode()); if (CollectionUtils.isEmpty(chargingRealTimeData)) { + logger.info("订单号:{}已经支付超过15分钟,充电桩:{}未启动,但是该桩无0x13实时数据,执行退款逻辑", orderBasicInfo.getOrderCode(), pileConnectorCode); // 充电桩在线,并且没有0x13实时数据,则执行结算退款操作 chargingPileFailedToStart(orderBasicInfo.getTransactionCode(), "充电桩启动失败,充电订单:" + orderBasicInfo.getOrderCode() + "执行退款处理"); + } else { + logger.info("订单号:{}已经支付超过15分钟,充电桩:{}未启动,但是该桩有0x13实时数据,该订单已启动成功,请检查", orderBasicInfo.getOrderCode(), pileConnectorCode); } } }