From 6780f859cbca72263b47d2280e8af0a60e4e84b2 Mon Sep 17 00:00:00 2001 From: zpc Date: Sat, 6 Dec 2025 23:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs | 9 +++++++-- .../CoreCms.Net.Web.WebApi/Controllers/SQController.cs | 6 ++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/server/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs b/server/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs index 6da2c12..92c15dd 100644 --- a/server/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs +++ b/server/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; +using System.Runtime.InteropServices; using System.Text; using System.Threading.Tasks; @@ -88,6 +89,10 @@ namespace CoreCms.Net.Model.ViewModels.SQ public class SQReservationsAddDto : SQReservations { + /// + /// 最晚到店时间 + /// + public long? LatestDateTime { get; set; } /// /// 开始时间 @@ -422,8 +427,8 @@ namespace CoreCms.Net.Model.ViewModels.SQ public string game_type { get; set; } } - - + + /// /// 可选日期信息DTO diff --git a/server/CoreCms.Net.Web.WebApi/Controllers/SQController.cs b/server/CoreCms.Net.Web.WebApi/Controllers/SQController.cs index 74cc9e1..e6e8440 100644 --- a/server/CoreCms.Net.Web.WebApi/Controllers/SQController.cs +++ b/server/CoreCms.Net.Web.WebApi/Controllers/SQController.cs @@ -516,6 +516,11 @@ public class SQController : ControllerBase var userId = _user.ID; var start_time = DateTimeOffset.FromUnixTimeSeconds(dto.start_time).AddHours(8).DateTime; var end_time = DateTimeOffset.FromUnixTimeSeconds(dto.end_time).AddHours(8).DateTime; + if (dto?.LatestDateTime > 0) + { + dto.latest_arrival_time = DateTimeOffset.FromUnixTimeSeconds(dto.LatestDateTime ?? 0).AddHours(8).DateTime; + } + // 1. 参数校验 if (dto == null || dto.room_id <= 0 || start_time >= end_time) { @@ -631,6 +636,7 @@ public class SQController : ControllerBase updated_at = DateTime.Now, credit_limit = dto.credit_limit, player_count = dto.player_count, + latest_arrival_time = dto.latest_arrival_time, deposit_fee = dto.deposit_fee, duration_minutes = (int)(end_time - start_time).TotalMinutes, extra_info = dto.extra_info,