订单退款，选择生成保洁，当前房间有订单不生成保洁

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

@@ -410,7 +410,8 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (request.getIsClean().equals(YesNoEnum.yes.getIndex())) {
             //判断订单是否已经添加保洁记录
             SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(sOrder.getRoomId());
-            if(ObjectUtil.isEmpty(cleanRecords) || cleanRecords.getStatus().equals(CleaningStatusEnum.CLEANED.getCode())) {
+            if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>().eq(SOrder::getRoomId, sOrder.getRoomId()).eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())))
+                    && (ObjectUtil.isEmpty(cleanRecords) || cleanRecords.getStatus().equals(CleaningStatusEnum.CLEANED.getCode()))) {
                 //房间添加保洁记录
                 boolean b = isCleanRecordsService.addSCleanRecords(sOrder.getStoreId(), sOrder.getRoomId());
             }
@@ -599,7 +600,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         }
         // 判断原房间是否生成保洁
         if (dto.getIsClean().equals(YesNoEnum.yes.getIndex())) {
-            //判断当前房间是否使用中
             //判断订单是否已经添加保洁记录
             SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(sOrder.getRoomId());
             if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>().eq(SOrder::getRoomId, sOrder.getRoomId()).eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode()))) &&