diff --git a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java index ca1315b6d..80cd86944 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/OrderService.java @@ -445,14 +445,11 @@ public class OrderService { try { if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.IN_THE_CHARGING.getValue())) { RealTimeMonitorData lastMonitorData = vo.getLastMonitorData(); - if (lastMonitorData != null) { - String dateTime = lastMonitorData.getDateTime(); - if (DateUtils.intervalTime(dateTime, DateUtils.getDateTime()) > 2L) { - // 间隔时间超过2分钟, 订单状态修改为异常 - orderBasicInfo.setOrderStatus(OrderStatusEnum.ABNORMAL.getValue()); - orderBasicInfo.setReason("充电桩长时间没有上传实时数据"); - orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); - } + if (lastMonitorData == null || DateUtils.intervalTime(lastMonitorData.getDateTime(), DateUtils.getDateTime()) > 2L) { + // 没有实时数据 或者 间隔时间超过2分钟, 订单状态修改为异常 + orderBasicInfo.setOrderStatus(OrderStatusEnum.ABNORMAL.getValue()); + orderBasicInfo.setReason("充电桩长时间没有上传实时数据"); + orderBasicInfoService.updateOrderBasicInfo(orderBasicInfo); } } } catch (Exception e) {