f1x

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

@@ -1283,7 +1283,6 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         return true;
     }
 
-    @Transactional(rollbackFor = Exception.class)
     private Boolean mergeSingle(String mergeLivingOrderId, String livingOrderId) {
         BusRoomsLivingOrder mergeLivingOrder = roomsLivingOrderService.getById(mergeLivingOrderId);
         if(mergeLivingOrder == null) throw new JeecgBootException("合并的订单不存在");
@@ -1304,7 +1303,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             bookingRoomsService.updateBatchById(bookingRoomsList);
             needMergeLivingOrders.addAll(relationOtherLivingOrders);
 
-            BusBookingRooms mainBkRoom = bookingRoomsService.getOne(Wrappers.<BusBookingRooms>query().eq("booking_order_id",bookingRooms.getBookingOrdersId()));
+            BusBookingRooms mainBkRoom = bookingRoomsService.getOne(Wrappers.<BusBookingRooms>query().eq("booking_orders_id",bookingRooms.getBookingOrdersId()));
             if(mainBkRoom != null) mainBkRoom.setIsMain(true);
             bookingRoomsService.updateById(mainBkRoom); // 设置预约的主房
         } else {