From 074485f56f073cf11fb29e6aab4ec9a2d4f3f549 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 19 九月 2024 14:10:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/BookingsService.java | 14 +++++++++++---
1 files changed, 11 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 40450f7..6a56fb5 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
@@ -4,6 +4,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.business.vo.RoomStatisticsVo;
@@ -16,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;
@@ -165,10 +167,8 @@
/**
* 浼氳棰勭害璁板綍鍙栨秷
- * @param id
- * @param userId
*/
- void reservationCancel(Integer id,Integer userId);
+ void reservationCancel(BusinessOverDTO businessOverDTO);
/**
@@ -207,4 +207,12 @@
void sendBookingsNotice();
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