订单完成15分钟内续单增加订单查询条件，15分钟后增加判断（当前房间没有使用中的订单）才断电

share-quartz/src/main/java/share/quartz/task/RedisTask.java

@@ -315,7 +315,7 @@ public class RedisTask {
                 List<SOrder> orderList = orderService.list(new LambdaQueryWrapper<SOrder>()
                         .eq(SOrder::getRoomId, sOrder.getRoomId())
                         .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())
-                        .eq(SOrder::getOrderType, OrderTypeEnum.RENEW.getCode())
+                        .in(SOrder::getOrderType, OrderTypeEnum.RENEW.getCode(), OrderTypeEnum.RESERVER.getCode())
                 );
                 if (!CollectionUtils.isEmpty(orderList)) {
                     redisUtil.delete(key);
@@ -324,7 +324,10 @@ public class RedisTask {
                 SCleanRecords sCleanRecords = isCleanRecordsService.getOne(new LambdaQueryWrapper<SCleanRecords>().
                         eq(SCleanRecords::getRoomId, sOrder.getRoomId()).
                         eq(SCleanRecords::getStatus, CleaningStatusEnum.CLEANING.getCode()));
-                if (ObjectUtils.isEmpty(sCleanRecords)) {
+                List<SOrder> orderList = orderService.list(new LambdaQueryWrapper<SOrder>()
+                        .eq(SOrder::getRoomId, sOrder.getRoomId())
+                        .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode()));
+                if (ObjectUtils.isEmpty(sCleanRecords) && !CollectionUtils.isEmpty(orderList)) {
                     deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(), OpTypeEnum.CUT_ELECTRIC.getCode(), false, 0L,
                             DeviceOpSourceEnum.DEVICE_SOURCE_20.getCode());
                 }