订单换房，生成保洁,当前房间正在使用中，不生成保洁

share-system/src/main/java/share/system/domain/vo/SOrderVo.java

@@ -154,7 +154,7 @@ public class SOrderVo
      * 创建时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "订单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "下单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     @Excel(name = "备注")

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

@@ -599,9 +599,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         }
         // 判断原房间是否生成保洁
         if (dto.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()))) {
                 //房间添加保洁记录
                 isCleanRecordsService.addSCleanRecords(sOrder.getStoreId(), sOrder.getRoomId());
             }