refactor: 重构用户与勋章体系,统一状态管理与数据结构
1. 新增通用默认状态枚举 DefaultStatusEnum,替换原有分散的状态枚举 2. 重构用户体系:拆分 WxUser 独立表存储微信身份,Users 表改为角色子用户表并关联 WxUser 3. 重构勋章模块:新增系统/期刊勋章类型,调整 JournalId 为可空,新增勋章状态字段 4. 重构微信认证流程:基于 WxUser 生成 Token,支持多子用户管理 5. 清理冗余枚举文件,重构多处业务逻辑适配新的数据结构 6. 修复用户手机号关联逻辑,迁移手机号字段至 WxUser 表
This commit is contained in:
@ -23,7 +23,7 @@ public class WeChatAuthController : WeChatBaseController
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 微信小程序登录(首次创建用户,非首次直接登录)
|
||||
/// 微信小程序登录(首次仅创建 WxUser,不自动创建 User)
|
||||
/// </summary>
|
||||
/// <param name="input">登录输入(含微信 code 和可选的手机号 code)</param>
|
||||
/// <returns>登录结果(含 Token 和用户列表)</returns>
|
||||
@ -75,22 +75,18 @@ public class WeChatAuthController : WeChatBaseController
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 切换用户(同一 OpenId 下切换身份)
|
||||
/// 切换用户(同一 WxUser 下切换 User 身份)
|
||||
/// </summary>
|
||||
/// <param name="input">切换用户输入(含目标用户ID)</param>
|
||||
/// <returns>切换结果(含新 Token 和目标用户详情)</returns>
|
||||
[HttpPost("switchUser")]
|
||||
public async Task<BaseResponse<WeChatSwitchUserOutput>> SwitchUserAsync([FromBody] WeChatSwitchUserInput input)
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = GetCurrentUserId();
|
||||
if (userId == null)
|
||||
{
|
||||
var wxUserId = GetCurrentWxUserId();
|
||||
if (wxUserId == null)
|
||||
return BaseResponse<WeChatSwitchUserOutput>.Fail(ResultCode.DENY, "未获取到用户信息");
|
||||
}
|
||||
|
||||
var result = await _weChatAuthService.SwitchUserAsync(userId.Value, input);
|
||||
var result = await _weChatAuthService.SwitchUserAsync(wxUserId.Value, input);
|
||||
return Success(result);
|
||||
}
|
||||
catch (BusinessException ex)
|
||||
@ -104,4 +100,58 @@ public class WeChatAuthController : WeChatBaseController
|
||||
return BaseResponse<WeChatSwitchUserOutput>.Fail("切换用户失败,请稍后重试");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取当前微信用户下的所有用户列表
|
||||
/// </summary>
|
||||
[HttpGet("users")]
|
||||
public async Task<BaseResponse<List<WxUserOutput>>> GetUsersAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
var wxUserId = GetCurrentWxUserId();
|
||||
if (wxUserId == null)
|
||||
return BaseResponse<List<WxUserOutput>>.Fail(ResultCode.DENY, "未获取到用户信息");
|
||||
|
||||
var result = await _weChatAuthService.GetUsersAsync(wxUserId.Value);
|
||||
return Success(result);
|
||||
}
|
||||
catch (BusinessException ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "获取用户列表业务异常: {Message}", ex.Message);
|
||||
return BaseResponse<List<WxUserOutput>>.Fail(ex.Message);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "获取用户列表系统异常");
|
||||
return BaseResponse<List<WxUserOutput>>.Fail("获取用户列表失败,请稍后重试");
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 在当前微信用户下新增用户(子用户/角色)
|
||||
/// </summary>
|
||||
[HttpPost("createUser")]
|
||||
public async Task<BaseResponse<WxUserOutput>> CreateUserAsync([FromBody] CreateChildUserInput input)
|
||||
{
|
||||
try
|
||||
{
|
||||
var wxUserId = GetCurrentWxUserId();
|
||||
if (wxUserId == null)
|
||||
return BaseResponse<WxUserOutput>.Fail(ResultCode.DENY, "未获取到用户信息");
|
||||
|
||||
var result = await _weChatAuthService.CreateUserAsync(wxUserId.Value, input);
|
||||
return Success(result);
|
||||
}
|
||||
catch (BusinessException ex)
|
||||
{
|
||||
_logger.LogWarning(ex, "新增用户业务异常: {Message}", ex.Message);
|
||||
return BaseResponse<WxUserOutput>.Fail(ex.Message);
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.LogError(ex, "新增用户系统异常");
|
||||
return BaseResponse<WxUserOutput>.Fail("新增用户失败,请稍后重试");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user