修改人工退款断电逻辑

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -445,16 +445,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             if (oldSOrder.getStatus().equals(OrderStatusEnum.INUSE.getCode())) {
                 // 使用中订单断电, 延时3分钟断电
                 deviceOpService.openOrCloseDevice(oldSOrder.getRoomId(), oldSOrder.getConsumerPhone(),
-                        OpTypeEnum.CUT_ELECTRIC.getCode(), true, 10);
-//            } else if (oldSOrder.getStatus().equals(OrderStatusEnum.UNUSED.getCode())) {
-//                LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
-//                queryWrapper.eq(SOrder::getRoomId, oldSOrder.getRoomId());
-//                queryWrapper.eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode());
-//                List<SOrder> list = list(queryWrapper);
-//                if (CollectionUtils.isEmpty(list)) {
-//                    deviceOpService.openOrCloseDevice(oldSOrder.getRoomId(), oldSOrder.getConsumerPhone(),
-//                            OpTypeEnum.CUT_ELECTRIC.getCode(), true, 10);
-//                }
+                        OpTypeEnum.CUT_ELECTRIC.getCode(), false, 0);
             }
 
         } else if (oldSOrder.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
@@ -475,7 +466,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 } else {
                     // 使用中订单断电, 延时3分钟断电
                     deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(),
-                            OpTypeEnum.CUT_ELECTRIC.getCode(), true, 10);
+                            OpTypeEnum.CUT_ELECTRIC.getCode(), false, 0);
                 }
             } else if (one.getStatus().equals(OrderStatusEnum.INUSE.getCode())) {
                 Map<String, String> map = new HashMap<>();