From f547171a98907dbd9f824f145df4c902ff121683 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 20 九月 2024 10:13:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
index 7ea8a40..4f92c34 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java
@@ -17,6 +17,7 @@
 import com.doumee.dao.web.response.DateTimeResourceDate;
 import com.doumee.dao.web.response.MeetingDetailResponse;
 import com.doumee.dao.web.response.MeetingListResponse;
+import com.doumee.dao.web.response.RoomDetailResponse;
 import org.apache.ibatis.annotations.Param;
 
 import java.time.LocalDateTime;
@@ -142,7 +143,7 @@
      * @param id
      * @return
      */
-    MeetingDetailResponse getMeetingDetail(Integer id);
+    MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId);
 
     /**
      * 鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅
@@ -166,8 +167,6 @@
 
     /**
      * 浼氳棰勭害璁板綍鍙栨秷
-     * @param id
-     * @param userId
      */
     void reservationCancel(BusinessOverDTO businessOverDTO);
 
@@ -210,4 +209,10 @@
     IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap);
 
     void reservationOver(BusinessOverDTO businessOverDTO);
+
+    void start(BusinessOverDTO businessOverDTO);
+
+    void startEarly(BusinessOverDTO businessOverDTO);
+
+    RoomDetailResponse getRoomDetail(Integer roomId);
 }

--
Gitblit v1.9.3