合并

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

@@ -42,12 +42,7 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
     String batchOrderSave(BatchOrderSavaDto item);
 
     Boolean setBatchOrderStatus(BusBookingBatch batchOrder);
-<<<<<<< HEAD
-
-    String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId, Boolean bookingLiving);
-=======
     String bookingToLive(String bookingRoomId, List<BusLivingCustomer> customers, String hotelId,Boolean bookingLiving, BusRoomBookingOrders livingRoomOrderInfo);
->>>>>>> 602bdfd9e14a7ea3459d7b94202cf0e77c926517
 
     String customerLiving(BookingOrderSaveDto livingData, Boolean isTeam, String hotelId);
 
@@ -57,52 +52,33 @@ public interface IBusRoomBookingOrdersService extends IService<BusRoomBookingOrd
 
     Boolean syncDayRoomOrder(String hotelId);
 
-    BigDecimal getOrderFeeTotal(String livingOrderId, String bookingOrderId);
-
+    BigDecimal getOrderFeeTotal(String livingOrderId,String bookingOrderId);
     Boolean settleBillCheckOut(List<BusOrderFee> settleFees, String bookingOrderId);
-
-    Boolean continueLiving(BusOrderFee settleFee, Date dueOutTime, String livingOrderId, String hotelId);
-
+    Boolean continueLiving(BusOrderFee settleFee, Date dueOutTime,String livingOrderId,String hotelId);
     Boolean livingSettleBillCheckOut(List<BusOrderFee> settleFees, String livingOrderId);
-
     Boolean partialSettle(PartialSettleVo param);
-
     Boolean splitLiving(String livingOrderId);
-
     Boolean leaveNotSettle(String bookingOrderId, String livingOrderId);
 
-    IPage<RoomLivingQueryVo> getLivingPageData(Integer status, String keyw, Page<RoomLivingQueryVo> page, String hotelId);
-
-    IPage<KeLiItemVo> getLivingOrderKL(Integer status, String keyw, String hotelId, String thirdUserId, Page<KeLiItemVo> page);
-
-    IPage<KeLiItemVo> getBookingOrderKL(Integer status, String keyw, String hotelId, String thirdUserId, Page<KeLiItemVo> page);
-
-    Boolean setLivingOrderFee(List<BusOrderFee> fees, String livingOrderId, String hotelId);
-
-    Boolean unionOrder(String roomId, String targetRoomId, String bookingOrderId, String hotelId);
-
+    IPage<RoomLivingQueryVo> getLivingPageData(Integer status,String keyw, Page<RoomLivingQueryVo> page,String hotelId);
+    IPage<KeLiItemVo> getLivingOrderKL(Integer status,String keyw,String hotelId,String thirdUserId, Page<KeLiItemVo> page);
+    IPage<KeLiItemVo> getBookingOrderKL(Integer status,String keyw,String hotelId,String thirdUserId, Page<KeLiItemVo> page);
+    Boolean setLivingOrderFee(List<BusOrderFee> fees,String livingOrderId,String hotelId);
+    Boolean unionOrder(String roomId,String targetRoomId, String bookingOrderId, String hotelId);
     Boolean mergeOrder(String livingRoomId, List<String> livingOrderId);
-
-    ForwardFangTaiVo forwardFangTai(String start, String end, String hotelId, Boolean isContainLeave);
-
+    ForwardFangTaiVo forwardFangTai(String start, String end, String hotelId,Boolean isContainLeave);
     RiLiFangTaiResultVo riliFangTai(String start, String end, String hotelId);
-
     Boolean updateOrderInfo(Integer type, UpdateOrderInfoDto info);
-
     Boolean updateOrderPrice(UpdateOrderPriceDto info);
-
     void syncDayOrderFee();
-
     void syncDayOrderFeeItem(BusRoomsLivingOrder order, CesAllDayPriceRule allDayRule);
-
     List<BusRoomBookingOrders> countTodayYD(String hotelId);
 
     /**
      * 根据手机号查询入住历史列表
-     * @param page
      * @param hotelId
      * @param phone
      * @return
      */
-    Page<HashMap<String, Object>> ruZhuHistoryList(Page<HashMap<String, Object>> page,  String hotelId, String phone);
+     Page<HashMap<String, Object>> ruZhuHistoryList(Page<HashMap<String, Object>> page, String hotelId, String phone);
 }