Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-backend

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

@@ -643,7 +643,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             throw new JeecgBootException("请选择批次房间");
         SimpleDateFormat sdfPc = new SimpleDateFormat("yyyyMMddHHmmssSSS");
         c.setBatchNo("YDPC"+sdfPc.format(System.currentTimeMillis()));
-        c.setBookingOrdersId(item.getOrderInfo().getId());
+        c.setBookingOrdersId(item.getOrderInfo().getBookingOrdersId());
 
 //        BusBookingBatch batchItem = copyBatchToBase(c);
 //        BusBookingBatch batchItem = copyBatchToBase(c);
@@ -666,7 +666,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
             }
             bookingRoomItem.setBookingType(2);
             bookingRoomItem.setBookingBatchId(c.getId());
-            bookingRoomItem.setBookingOrdersId(item.getOrderInfo().getId());
+            bookingRoomItem.setBookingOrdersId(item.getOrderInfo().getBookingOrdersId());
             batchBookingRooms.add(bookingRoomItem);
         });
         if(mainCount != 1) {
@@ -683,7 +683,7 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
         item.getLayoutDayPrices().forEach(g->{
             long roomCount = item.getRoomIds().stream().filter(e->e.getLayoutId().equals(g.getRoomLayoutId())).count();
             if(roomCount > 0 ) {
-                g.setBookingOrderId(item.getOrderInfo().getId());
+                g.setBookingOrderId(item.getOrderInfo().getBookingOrdersId());
                 g.setBookingType(BookingOrdersType.TEAM.getKey());
                 g.setBatchId(c.getId());
             }