Browse Source

修改GetCharacterByAccountId -> GetCurrentCharacterByAccountId;

master
hanqin 2 weeks ago
parent
commit
e39c13d5d2
  1. 14
      Build_God_Api/Build_God_Api/Controllers/BattleController.cs
  2. 2
      Build_God_Api/Build_God_Api/Controllers/CharacterController.cs
  3. 6
      Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs
  4. 2
      Build_God_Api/Build_God_Api/Controllers/MissionController.cs
  5. 4
      Build_God_Api/Build_God_Api/Controllers/ShopController.cs
  6. 2
      Build_God_Api/Build_God_Api/Hubs/ChatHub.cs
  7. 4
      Build_God_Api/Build_God_Api/Services/CharacterService.cs

14
Build_God_Api/Build_God_Api/Controllers/BattleController.cs

@ -23,18 +23,12 @@ namespace Build_God_Api.Controllers
[HttpPost("challenge")] [HttpPost("challenge")]
public async Task<ActionResult<ChallengeMonsterResponse>> ChallengeMonster([FromBody] ChallengeMonsterRequest request) public async Task<ActionResult<ChallengeMonsterResponse>> ChallengeMonster([FromBody] ChallengeMonsterRequest request)
{ {
var characters = await _characterService.GetAllCharacters(); var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId);
var currentCharacter = characters if (character == null)
.Where(c => c.AccountId == _currentUserService.UserId)
.OrderByDescending(c => c.LastLogin)
.FirstOrDefault();
if (currentCharacter == null)
{ {
return BadRequest(new { message = "请先创建角色" }); return NotFound();
} }
return await _battleService.ChallengeMonster(character.Id, request.MonsterId);
return await _battleService.ChallengeMonster(currentCharacter.Id, request.MonsterId);
} }
} }
} }

2
Build_God_Api/Build_God_Api/Controllers/CharacterController.cs

@ -28,7 +28,7 @@ namespace Build_God_Api.Controllers
[Authorize] [Authorize]
public async Task<ActionResult<Character?>> GetCharacterByAccountId(int accountId) public async Task<ActionResult<Character?>> GetCharacterByAccountId(int accountId)
{ {
var result = await characterService.GetCharacterByAccountId(accountId); var result = await characterService.GetCurrentCharacterByAccountId(accountId);
return result; return result;
} }

6
Build_God_Api/Build_God_Api/Controllers/DailyMissionController.cs

@ -23,7 +23,7 @@ namespace Build_God_Api.Controllers
[Authorize] [Authorize]
public async Task<ActionResult<List<DailyMissionDto>>> GetList() public async Task<ActionResult<List<DailyMissionDto>>> GetList()
{ {
var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId);
if (character == null) if (character == null)
return BadRequest("角色不存在"); return BadRequest("角色不存在");
@ -40,7 +40,7 @@ namespace Build_God_Api.Controllers
{ {
try try
{ {
var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId);
if (character == null) if (character == null)
return BadRequest("角色不存在"); return BadRequest("角色不存在");
@ -62,7 +62,7 @@ namespace Build_God_Api.Controllers
{ {
try try
{ {
var character = await _characterService.GetCharacterByAccountId(_currentUserService.UserId); var character = await _characterService.GetCurrentCharacterByAccountId(_currentUserService.UserId);
if (character == null) if (character == null)
return BadRequest("角色不存在"); return BadRequest("角色不存在");

2
Build_God_Api/Build_God_Api/Controllers/MissionController.cs

@ -103,7 +103,7 @@ namespace Build_God_Api.Controllers
{ {
try try
{ {
var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId);
if (character == null) if (character == null)
return BadRequest("角色不存在"); return BadRequest("角色不存在");

4
Build_God_Api/Build_God_Api/Controllers/ShopController.cs

@ -61,7 +61,7 @@ namespace Build_God_Api.Controllers
[Authorize] [Authorize]
public async Task<ActionResult<ShopDto>> GetCharacterShop() public async Task<ActionResult<ShopDto>> GetCharacterShop()
{ {
var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId);
if (character == null) if (character == null)
{ {
return NotFound(); return NotFound();
@ -74,7 +74,7 @@ namespace Build_God_Api.Controllers
[Authorize] [Authorize]
public async Task<ActionResult<bool>> BuyItem([FromBody] ShopBuyDto dto) public async Task<ActionResult<bool>> BuyItem([FromBody] ShopBuyDto dto)
{ {
var character = await characterService.GetCharacterByAccountId(currentUserService.UserId); var character = await characterService.GetCurrentCharacterByAccountId(currentUserService.UserId);
if (character == null) if (character == null)
{ {
return NotFound(); return NotFound();

2
Build_God_Api/Build_God_Api/Hubs/ChatHub.cs

@ -49,7 +49,7 @@ namespace Build_God_Api.Hubs
return null; return null;
var accountId = _currentUserService.UserId; var accountId = _currentUserService.UserId;
var character = await _characterService.GetCharacterByAccountId(accountId); var character = await _characterService.GetCurrentCharacterByAccountId(accountId);
if (character == null) if (character == null)
return null; return null;

4
Build_God_Api/Build_God_Api/Services/CharacterService.cs

@ -9,7 +9,7 @@ namespace Build_God_Api.Services
{ {
public interface ICharacterService public interface ICharacterService
{ {
public Task<Character?> GetCharacterByAccountId(int accountId); public Task<Character?> GetCurrentCharacterByAccountId(int accountId);
public Task<List<Character>> GetCharactersByAccountId(int accountId); public Task<List<Character>> GetCharactersByAccountId(int accountId);
public Task<List<CharacterDto>> GetCharacterListWithDetails(int accountId); public Task<List<CharacterDto>> GetCharacterListWithDetails(int accountId);
public Task<List<Character>> GetAllCharacters(); public Task<List<Character>> GetAllCharacters();
@ -211,7 +211,7 @@ namespace Build_God_Api.Services
return await db.Queryable<Character>().AnyAsync(x => x.Name == name); return await db.Queryable<Character>().AnyAsync(x => x.Name == name);
} }
public async Task<Character?> GetCharacterByAccountId(int accountId) public async Task<Character?> GetCurrentCharacterByAccountId(int accountId)
{ {
return await db.Queryable<Character>() return await db.Queryable<Character>()
.Where(x => x.AccountId == accountId && x.isLocked == false) .Where(x => x.AccountId == accountId && x.isLocked == false)

Loading…
Cancel
Save