Merge branch 'dev' into test

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

@@ -314,6 +314,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 throw new BaseException("您的登录已过期，请先登录");
             }
             SStore sStore = storeService.getById(request.getStoreId());
+            SRoom room = roomService.getById(request.getRoomId());
+            if (ObjectUtil.isNotEmpty(room) && room.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
+                throw new BaseException("当前房间未保洁，请选择其他房间");
+            }
             //生成订单
             SOrder sOrder = generatSOrder(request, user);
             //校验订单金额
@@ -1095,9 +1099,6 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
         // 计算各种价格
         ComputedOrderPriceResponse priceResponse = new ComputedOrderPriceResponse();
         SRoom room = roomService.getById(request.getRoomId());
-        if (ObjectUtil.isNotEmpty(room) && room.getIsDirtyRoom().equals(YesNoEnum.yes.getIndex())) {
-            throw new BaseException("当前房间未保洁，请选择其他房间");
-        }
         BigDecimal totalPrice = computeTotalPrice(room.getPrice(), request.getPreStartDate(), request.getPreEndDate());
         BigDecimal payPrice;
         BuyTypeEnum buyTypeEnum = BuyTypeEnum.getEnumByCode(request.getBuyType());