From e39c13d5d2b77fcafd9fe7e9db6a8c8f7c100855 Mon Sep 17 00:00:00 2001 From: hanqin Date: Thu, 30 Apr 2026 14:26:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9GetCharacterByAccountId=20->?= =?UTF-8?q?=20GetCurrentCharacterByAccountId;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Build_God_Api/Controllers/BattleController.cs | 14 ++++---------- .../Controllers/CharacterController.cs | 2 +- .../Controllers/DailyMissionController.cs | 6 +++--- .../Build_God_Api/Controllers/MissionController.cs | 2 +- .../Build_God_Api/Controllers/ShopController.cs | 4 ++-- Build_God_Api/Build_God_Api/Hubs/ChatHub.cs | 2 +- .../Build_God_Api/Services/CharacterService.cs | 4 ++-- 7 files changed, 14 insertions(+), 20 deletions(-) diff --git a/Build_God_Api/Build_God_Api/Controllers/BattleController.cs b/Build_God_Api/Build_God_Api/Controllers/BattleController.cs index 8d160b0..8e6d9eb 100644 --- a/Build_God_Api/Build_God_Api/Controllers/BattleController.cs +++ b/Build_God_Api/Build_God_Api/Controllers/BattleController.cs @@ -23,18 +23,12 @@ namespace Build_God_Api.Controllers [HttpPost("challenge")] public async Task> ChallengeMonster([FromBody] ChallengeMonsterRequest request) { - var characters = await _characterService.GetAllCharacters(); - var currentCharacter = characters - .Where(c => c.AccountId == _currentUserService.UserId) - .OrderByDescending(c => c.LastLogin) - .FirstOrDefault(); - - if (currentCharacter == null) + var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId); + if (character == null) { - return BadRequest(new { message = "请先创建角色" }); + return NotFound(); } - - return await _battleService.ChallengeMonster(currentCharacter.Id, request.MonsterId); + return await _battleService.ChallengeMonster(character.Id, request.MonsterId); } } } \ No newline at end of file diff --git a/Build_God_Api/Build_God_Api/Controllers/CharacterController.cs b/Build_God_Api/Build_God_Api/Controllers/CharacterController.cs index 198af99..e885de7 100644 --- a/Build_God_Api/Build_God_Api/Controllers/CharacterController.cs +++ b/Build_God_Api/Build_God_Api/Controllers/CharacterController.cs @@ -28,7 +28,7 @@ namespace Build_God_Api.Controllers [Authorize] public async Task> GetCharacterByAccountId(int accountId) { - var result = await characterService.GetCharacterByAccountId(accountId); + var result = await characterService.GetCurrentCharacterByAccountId(accountId); return result; } diff --git a/Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs b/Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs index bccb120..df0a5a9 100644 --- a/Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs +++ b/Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs @@ -23,7 +23,7 @@ namespace Build_God_Api.Controllers [Authorize] public async Task>> GetList() { - var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); + var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId); if (character == null) return BadRequest("角色不存在"); @@ -40,7 +40,7 @@ namespace Build_God_Api.Controllers { try { - var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); + var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId); if (character == null) return BadRequest("角色不存在"); @@ -62,7 +62,7 @@ namespace Build_God_Api.Controllers { try { - var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); + var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId); if (character == null) return BadRequest("角色不存在"); diff --git a/Build_God_Api/Build_God_Api/Controllers/MissionController.cs b/Build_God_Api/Build_God_Api/Controllers/MissionController.cs index 1133ac1..6870dfd 100644 --- a/Build_God_Api/Build_God_Api/Controllers/MissionController.cs +++ b/Build_God_Api/Build_God_Api/Controllers/MissionController.cs @@ -103,7 +103,7 @@ namespace Build_God_Api.Controllers { try { - var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); + var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId); if (character == null) return BadRequest("角色不存在"); diff --git a/Build_God_Api/Build_God_Api/Controllers/ShopController.cs b/Build_God_Api/Build_God_Api/Controllers/ShopController.cs index fd63c57..de00157 100644 --- a/Build_God_Api/Build_God_Api/Controllers/ShopController.cs +++ b/Build_God_Api/Build_God_Api/Controllers/ShopController.cs @@ -61,7 +61,7 @@ namespace Build_God_Api.Controllers [Authorize] public async Task> GetCharacterShop() { - var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); + var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId); if (character == null) { return NotFound(); @@ -74,7 +74,7 @@ namespace Build_God_Api.Controllers [Authorize] public async Task> BuyItem([FromBody] ShopBuyDto dto) { - var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); + var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId); if (character == null) { return NotFound(); diff --git a/Build_God_Api/Build_God_Api/Hubs/ChatHub.cs b/Build_God_Api/Build_God_Api/Hubs/ChatHub.cs index 0ac38f7..d37b71c 100644 --- a/Build_God_Api/Build_God_Api/Hubs/ChatHub.cs +++ b/Build_God_Api/Build_God_Api/Hubs/ChatHub.cs @@ -49,7 +49,7 @@ namespace Build_God_Api.Hubs return null; var accountId = _currentUserService.UserId; - var character = await _characterService.GetCharacterByAccountId(accountId); + var character = await _characterService.GetCurrentCharacterByAccountId(accountId); if (character == null) return null; diff --git a/Build_God_Api/Build_God_Api/Services/CharacterService.cs b/Build_God_Api/Build_God_Api/Services/CharacterService.cs index d48f22f..01294d3 100644 --- a/Build_God_Api/Build_God_Api/Services/CharacterService.cs +++ b/Build_God_Api/Build_God_Api/Services/CharacterService.cs @@ -9,7 +9,7 @@ namespace Build_God_Api.Services { public interface ICharacterService { - public Task GetCharacterByAccountId(int accountId); + public Task GetCurrentCharacterByAccountId(int accountId); public Task> GetCharactersByAccountId(int accountId); public Task> GetCharacterListWithDetails(int accountId); public Task> GetAllCharacters(); @@ -211,7 +211,7 @@ namespace Build_God_Api.Services return await db.Queryable().AnyAsync(x => x.Name == name); } - public async Task GetCharacterByAccountId(int accountId) + public async Task GetCurrentCharacterByAccountId(int accountId) { return await db.Queryable() .Where(x => x.AccountId == accountId && x.isLocked == false)