小程序退款增加判断是否有使用中的订单才断电，删除

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

@@ -433,16 +433,21 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         redisUtil.delete(ReceiptRdeisEnum.ORDER_NO_KEY.getValue() + sOrder.getOrderNo());
         //判断订单类型
         if (sOrder.getOrderType().equals(OrderTypeEnum.RESERVER.getCode())) {
+            if (sOrder.getStatus().equals(OrderStatusEnum.INUSE.getCode())) {
+                // 使用中订单断电, 延时3分钟断电
+                deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(),
+                        OpTypeEnum.CUT_ELECTRIC.getCode(), true, 180);
+            } else if (sOrder.getStatus().equals(OrderStatusEnum.UNUSED.getCode())) {
                 LambdaQueryWrapper<SOrder> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(SOrder::getRoomId, sOrder.getRoomId());
                 queryWrapper.eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode());
                 List<SOrder> list = list(queryWrapper);
-            //使用中的直接断电或者待使用判断是否有使用中的订单
-            if (CollectionUtils.isEmpty(list) | sOrder.getStatus().equals(OrderStatusEnum.INUSE.getCode())) {
-                // 使用中订单断电, 延时3分钟断电
+                if (CollectionUtils.isEmpty(list)) {
                     deviceOpService.openOrCloseDevice(sOrder.getRoomId(), sOrder.getConsumerPhone(),
                             OpTypeEnum.CUT_ELECTRIC.getCode(), true, 180);
                 }
+            }
+
         } else if (sOrder.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
             //查询续单的前预定单
             Date preStartDate = sOrder.getPreStartDate();