diff --git a/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs b/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs index b3089b8..ba676f1 100644 --- a/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs +++ b/CoreCms.Net.Model/ViewModels/SQ/SQReservationsDto.cs @@ -203,11 +203,29 @@ namespace CoreCms.Net.Model.ViewModels.SQ public class SQPaymentRecordDto { + /// + /// 预约标题 + /// public string title { get; set; } + /// + /// 订单号 + /// public string paymentId { get; set; } + /// + /// 订单状态 1. 待支付 2. 已支付 3. 待退款 4. 已退款 + /// public int is_refund { get; set; } + /// + /// 加入时间 + /// public DateTime? join_time { get; set; } + /// + /// 预约状态 0 正常 ,1已退出 + /// public int status { get; set; } + /// + /// 订单状态 文字 如:待支付,已支付等 + /// public string is_refund_text { get; set; } } diff --git a/CoreCms.Net.Web.WebApi/Controllers/SQController.cs b/CoreCms.Net.Web.WebApi/Controllers/SQController.cs index b0b4f6a..8e4d2bb 100644 --- a/CoreCms.Net.Web.WebApi/Controllers/SQController.cs +++ b/CoreCms.Net.Web.WebApi/Controllers/SQController.cs @@ -1307,7 +1307,7 @@ public class SQController : ControllerBase if (pageSize <= 0) pageSize = 20; var sql = $@"SELECT sq.title, p.paymentId, p.is_refund, p.join_time, p.status, -CASE p.is_refund WHEN 1 THEN N'待支付' WHEN 2 THEN N'已支付' WHEN 3 THEN N'待退款' WHEN 4 THEN N'已退款' ELSE N'' END AS is_refund_text +CASE p.is_refund WHEN 1 THEN N'待支付' WHEN 2 THEN N'已支付' WHEN 3 THEN N'待退款' WHEN 4 THEN N'已退款' ELSE N'退款异常' END AS is_refund_text FROM SQReservationParticipants p LEFT JOIN SQReservations sq ON p.reservation_id = sq.id WHERE p.user_id = {userId} AND p.is_refund > 0 AND p.paymentId IS NOT NULL AND p.paymentId <> ''