修改生成保洁的订单查询条件

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

@@ -407,7 +407,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (request.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())))
+            if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>()
+                    .eq(SOrder::getRoomId, sOrder.getRoomId())
+                    .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())
+                    .ne(SOrder::getOrderNo, request.getOrderNo())))
                     && (ObjectUtil.isEmpty(cleanRecords) || cleanRecords.getStatus().equals(CleaningStatusEnum.CLEANED.getCode()))) {
                 //房间添加保洁记录
                 boolean b = isCleanRecordsService.addSCleanRecords(sOrder.getStoreId(), sOrder.getRoomId());
@@ -603,7 +606,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         if (dto.getIsClean().equals(YesNoEnum.yes.getIndex())) {
             //判断订单是否已经添加保洁记录
             SCleanRecords cleanRecords = isCleanRecordsService.lastCleanByRoomId(oldSOrder.getRoomId());
-            if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>().eq(SOrder::getRoomId, oldSOrder.getRoomId()).eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode()))) &&
+            if (ObjectUtil.isEmpty(getOne(new LambdaQueryWrapper<SOrder>()
+                    .eq(SOrder::getRoomId, oldSOrder.getRoomId())
+                    .eq(SOrder::getStatus, OrderStatusEnum.INUSE.getCode())
+                    .ne(SOrder::getOrderNo, oldSOrder.getOrderNo()))) &&
                     (ObjectUtil.isEmpty(cleanRecords) || cleanRecords.getStatus().equals(CleaningStatusEnum.CLEANED.getCode()))) {
                 //房间添加保洁记录
                 isCleanRecordsService.addSCleanRecords(oldSOrder.getStoreId(), oldSOrder.getRoomId());