fixbug

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/controller/BusRoomBookingOrdersController.java

@@ -114,8 +114,8 @@ public class BusRoomBookingOrdersController extends JeecgController<BusRoomBooki
 	 @ApiOperation(value="酒店预定订单-通过id获取订单详情", notes="酒店预定订单-通过id获取订单详情")
 	 //@RequiresPermissions("business:bus_room_booking_orders:getBookingOrderInfo")
 	 @GetMapping(value = "/getBookingOrderInfo")
-	private Result<BookingOrderEditVo> getBookingOrderInfo(String bookingOrderId) {
-	 	return Result.ok(service.getBookingInfoById(bookingOrderId));
+	private Result<BookingOrderEditVo> getBookingOrderInfo(String bookingOrderId,String bookingNo) {
+	 	return Result.ok(service.getBookingInfoById(bookingOrderId, bookingNo));
 	}
 	
 	/**

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/entity/BusRoomBookingOrders.java

@@ -168,7 +168,12 @@ public class BusRoomBookingOrders implements Serializable {
 	@Excel(name = "团队类型中的团队名称", width = 15)
     @ApiModelProperty(value = "团队类型中的团队名称")
     private String teamName;
-	/**领队名称*/
+    /**团队人数*/
+    @Excel(name = "团队人数", width = 15)
+    @ApiModelProperty(value = "团队人数")
+    private Integer teamPeopleNumber;
+
+    /**领队名称*/
 	@Excel(name = "领队名称", width = 15)
     @ApiModelProperty(value = "领队名称")
     private String leaderName;

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

@@ -15,7 +15,7 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
 
     String bookingOrderSave(BookingOrderSaveDto item);
 
-    BookingOrderEditVo getBookingInfoById(String orderId);
+    BookingOrderEditVo getBookingInfoById(String orderId, String bookingNo);
 
     Boolean editBooking(BookingOrderEditVo param);
 }

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

@@ -201,8 +201,13 @@ public class BusRoomBookingOrdersServiceImpl extends ServiceImpl<BusRoomBookingO
      * @return
      */
     @Override
-    public BookingOrderEditVo getBookingInfoById(String orderId) {
-        BusRoomBookingOrders orderInfo = getById(orderId);
+    public BookingOrderEditVo getBookingInfoById(String orderId,String orderNo) {
+        BusRoomBookingOrders orderInfo;
+        if(orderId != null && !orderId.isEmpty())
+            orderInfo= getById(orderId);
+        else if(orderNo != null && !orderNo.isEmpty())
+            orderInfo = getOne(Wrappers.<BusRoomBookingOrders>query().eq("booking_orders_no",orderNo));
+        else throw new JeecgBootException("参数错误");
         if(orderInfo == null) throw new JeecgBootException("预约单不存在");
         BookingOrderEditVo result = new BookingOrderEditVo();
         if(orderInfo.getBookingOrdersType().equals(BookingOrdersType.NORMAL.getKey())) {