debug

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/BusRoomBookingOrdersServiceImpl.java

@@ -314,6 +314,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean editBooking(BookingOrderEditVo item) {
         BusRoomBookingOrders order = getById(item.getOrderInfo().getId());
         if(order == null) throw new JeecgBootException("预约单不存在");
@@ -409,6 +410,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     bookingRoomsItem.setIsMain(c.getIsMain());
                 }
                 bookingRoomsItem.setRoomId(c.getRoomId());
+                if(c.getRoomLayoutId() != null && !c.getRoomLayoutId().isEmpty()) {
+                    bookingRoomsItem.setRoomLayoutId(c.getRoomLayoutId());
+                } else bookingRoomsItem.setRoomLayoutId(c.getLayoutId());
                 bookingRoomsItem.setRoomLayoutId(c.getLayoutId());
                 bookingRoomsItem.setBookingType(1);
                 bookingRooms.add(bookingRoomsItem);
@@ -476,7 +480,9 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
                     } else {
                         bookingRoomItem.setIsMain(s.getIsMain());
                     }
-                    bookingRoomItem.setRoomLayoutId(s.getLayoutId());
+                    if(s.getRoomLayoutId() != null && !s.getRoomLayoutId().isEmpty()) {
+                        bookingRoomItem.setRoomLayoutId(s.getRoomLayoutId());
+                    } else bookingRoomItem.setRoomLayoutId(s.getLayoutId());
                     bookingRoomItem.setBookingType(2);
                     bookingRoomItem.setBookingBatchId(batchItem.getId());
                     bookingRoomItem.setBookingOrdersId(item.getOrderInfo().getId());