server/Coreshop
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

321

Browse Source
This commit is contained in:
zpc 2025-09-14 02:52:44 +08:00
parent 2d0a4f39d6
commit 94fed90038
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CoreCms.Net.Web.WebApi/Controllers/SQController.cs
View File

@ -403,6 +403,7 @@ ISQRoomUnavailableTimesServices sQRoomUnavailableTimesServices
/// <param name="endTime">结束时间 时间戳</param> /// <param name="endTime">结束时间 时间戳</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<WebApiDto> GetReservationRoomList([FromQuery] long startTime, [FromQuery] long endTime) public async Task<WebApiDto> GetReservationRoomList([FromQuery] long startTime, [FromQuery] long endTime)
{ {
// 时间戳转DateTime // 时间戳转DateTime
@ -410,7 +411,7 @@ ISQRoomUnavailableTimesServices sQRoomUnavailableTimesServices
var end = DateTimeOffset.FromUnixTimeSeconds(endTime).DateTime; var end = DateTimeOffset.FromUnixTimeSeconds(endTime).DateTime;
// 1. 查询所有可用房间 // 1. 查询所有可用房间
var allRooms = await _SQRoomsServices.QueryListByClauseAsync(r => r.status == true); var allRooms = await _SQRoomsServices.GetRoomList();
// 2. 查询有不可用时间段冲突的房间 // 2. 查询有不可用时间段冲突的房间
var unavailableRoomIds = (await _sQRoomUnavailableTimesServices.QueryListByClauseAsync( var unavailableRoomIds = (await _sQRoomUnavailableTimesServices.QueryListByClauseAsync(
@ -424,7 +425,7 @@ ISQRoomUnavailableTimesServices sQRoomUnavailableTimesServices
// 4. 可预约房间 = 所有可用房间 - 不可用房间 - 已预约房间 // 4. 可预约房间 = 所有可用房间 - 不可用房间 - 已预约房间
var availableRooms = allRooms var availableRooms = allRooms
.Where(r => !unavailableRoomIds.Contains(r.id) && !reservedRoomIds.Contains(r.id)) .Where(r => r.status == true && !unavailableRoomIds.Contains(r.id) && !reservedRoomIds.Contains(r.id))
.ToList(); .ToList();
return new WebApiDto() return new WebApiDto()