From 3a8477efae582b9381695627ad9308855816efe3 Mon Sep 17 00:00:00 2001 From: milimoe Date: Tue, 12 May 2026 01:23:22 +0800 Subject: [PATCH] fix bug --- OshimaServers/Service/CSBettingService.cs | 2 +- .../Controllers/CSBettingController.cs | 5 +++- .../Services/CSBettingInputHandler.cs | 30 ++++++++++--------- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/OshimaServers/Service/CSBettingService.cs b/OshimaServers/Service/CSBettingService.cs index 5c6d30b..cc0d86c 100644 --- a/OshimaServers/Service/CSBettingService.cs +++ b/OshimaServers/Service/CSBettingService.cs @@ -828,7 +828,7 @@ namespace Oshima.FunGame.WebAPI.Services // 检查比赛是否存在 sql.Parameters["@mid"] = request.MatchId; - sql.ExecuteDataSet("SELECT status, available_options FROM csbetting_matches WHERE id = @mid"); + sql.ExecuteDataSet("SELECT status, available_options, bet_deadline FROM csbetting_matches WHERE id = @mid"); if (!sql.Success || sql.DataSet.Tables[0].Rows.Count == 0) { error = "比赛不存在。"; diff --git a/OshimaWebAPI/Controllers/CSBettingController.cs b/OshimaWebAPI/Controllers/CSBettingController.cs index 0b73776..e895d46 100644 --- a/OshimaWebAPI/Controllers/CSBettingController.cs +++ b/OshimaWebAPI/Controllers/CSBettingController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Authorization; +using System.Security.Cryptography; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Milimoe.FunGame.Core.Api.Utility; @@ -232,6 +233,7 @@ namespace Oshima.FunGame.WebAPI.Controllers if (CSBettingService.CreateEvent(request.Name, request.StartTime, request.EndTime, out string error, out long? newId)) { md.Content = $"赛事创建成功!新赛事ID:{newId}"; + reply.Keyboard = new KeyboardMessage().AppendButtons(1, Button.CreateCmdButton("🔍 赛事详情", $"赛事详情 {newId}")); } else { @@ -266,6 +268,7 @@ namespace Oshima.FunGame.WebAPI.Controllers request.StartTime, request.BetDeadline, request.AvailableOptions, request.Team1WinOdds, request.Team2WinOdds, request.Team1WinProbability, out string error, out long? newId)) { md.Content = $"比赛创建成功!新比赛ID:{newId}"; + reply.Keyboard = new KeyboardMessage().AppendButtons(1, Button.CreateCmdButton("🔍 比赛详情", $"比赛详情 {newId}")); } else { diff --git a/OshimaWebAPI/Services/CSBettingInputHandler.cs b/OshimaWebAPI/Services/CSBettingInputHandler.cs index efd11ca..eb3cccf 100644 --- a/OshimaWebAPI/Services/CSBettingInputHandler.cs +++ b/OshimaWebAPI/Services/CSBettingInputHandler.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using System.Security.Cryptography; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Models; using Oshima.FunGame.OshimaServers.Model; @@ -38,18 +39,6 @@ namespace Oshima.FunGame.WebAPI.Services return true; } - // 赛事列表 - if (e.Detail.StartsWith("赛事") || e.Detail.StartsWith("赛事列表")) - { - int page = 1; - string detail = e.Detail.Replace("赛事", "").Replace("赛事列表", "").Trim(); - System.Text.RegularExpressions.Match match = GetFirstNumber().Match(detail); - if (match.Success && int.TryParse(match.Value, out int p)) page = p; - BotReply reply = BettingController.GetEventsOverview(page); - await SendAsync(e, "CS赛事预测", reply); - return true; - } - // 赛程:显示所有比赛 if (e.Detail.StartsWith("赛程") || e.Detail.StartsWith("比赛列表")) { @@ -135,6 +124,18 @@ namespace Oshima.FunGame.WebAPI.Services return true; } + // 赛事列表 + if (e.Detail.StartsWith("赛事") || e.Detail.StartsWith("赛事列表")) + { + int page = 1; + string detail = e.Detail.Replace("赛事", "").Replace("赛事列表", "").Trim(); + System.Text.RegularExpressions.Match match = GetFirstNumber().Match(detail); + if (match.Success && int.TryParse(match.Value, out int p)) page = p; + BotReply reply = BettingController.GetEventsOverview(page); + await SendAsync(e, "CS赛事预测", reply); + return true; + } + if (e.Detail.StartsWith("我的预测")) { int page = 1; @@ -232,7 +233,8 @@ namespace Oshima.FunGame.WebAPI.Services .AppendButtons(2, Button.CreateCmdButton("📋 赛事列表", "赛事列表"), Button.CreateCmdButton("📅 比赛列表", "比赛列表"), - Button.CreateCmdButton("⚙️ 继续结算", "结算比赛 ", enter: false)); + Button.CreateCmdButton("⚙️ 继续结算", "结算比赛 ", enter: false), + Button.CreateCmdButton("🔍 比赛详情", $"比赛详情 {mid}")); await SendAsync(e, "CS赛事预测", reply); } else