feat: 完成多模块功能迭代与优化

1.  新增宠物皮肤初始枚举值、下拉列表接口及相关DTO
2.  完善商品实体与DTO,新增虚拟商品标记和类型ID字段
3.  重构用户认证体系,支持多用户切换并重新生成JWT令牌
4.  新增签到配置管理全套功能,包括增删改查和状态管理
5.  优化模型验证过滤器和基础响应类的命名规范
6.  新增补签功能,完善签到服务逻辑
7.  拆分用户详情DTO,新增各子数据分页查询接口
8.  重构微信控制器的用户ID获取逻辑,统一使用激活用户ID
9.  修复背包服务中补签卡的扣减逻辑
10. 新增家长姓名修改接口和相关服务实现
This commit is contained in:
glz
2026-06-10 17:53:38 +08:00
parent 028e3dfb34
commit ae4cd627df
35 changed files with 1334 additions and 316 deletions

View File

@ -13,7 +13,7 @@ public class BaseResponse
/// </summary>
public BaseResponse()
{
Code = ResultCode.SUCCESS;
code = ResultCode.SUCCESS;
}
#region
@ -21,12 +21,12 @@ public class BaseResponse
/// <summary>
/// 操作描述
/// </summary>
public string Message { get; set; }
public string message { get; set; }
/// <summary>
/// 结果Code
/// </summary>
public ResultCode Code { get; set; }
public ResultCode code { get; set; }
#endregion
@ -37,7 +37,7 @@ public class BaseResponse
/// </summary>
public static BaseResponse Success()
{
return new BaseResponse { Code = ResultCode.SUCCESS, Message = "操作成功。" };
return new BaseResponse { code = ResultCode.SUCCESS, message = "操作成功。" };
}
/// <summary>
@ -45,7 +45,7 @@ public class BaseResponse
/// </summary>
public static BaseResponse Success(string message = "操作成功。")
{
return new BaseResponse { Code = ResultCode.SUCCESS, Message = message };
return new BaseResponse { code = ResultCode.SUCCESS, message = message };
}
/// <summary>
@ -53,7 +53,7 @@ public class BaseResponse
/// </summary>
public static BaseResponse Fail(string message, ResultCode code = ResultCode.FAIL)
{
return new BaseResponse { Code = code, Message = message };
return new BaseResponse { code = code, message = message };
}
/// <summary>
@ -61,7 +61,7 @@ public class BaseResponse
/// </summary>
public static BaseResponse AuthFail(string message, ResultCode code = ResultCode.FAIL)
{
return new BaseResponse { Code = code, Message = message };
return new BaseResponse { code = code, message = message };
}
#endregion
@ -69,7 +69,7 @@ public class BaseResponse
/// <summary>
/// 操作结果
/// </summary>
public bool IsSuccess => Code == ResultCode.SUCCESS;
public bool isSuccess => code == ResultCode.SUCCESS;
}
/// <summary>
@ -82,7 +82,7 @@ public class BaseResponse<T> : BaseResponse
/// <summary>
/// 操作结果
/// </summary>
public T? Result { get; set; }
public T? result { get; set; }
#region
@ -91,7 +91,7 @@ public class BaseResponse<T> : BaseResponse
/// </summary>
public static BaseResponse<T> Success(T result)
{
return new BaseResponse<T> { Code = ResultCode.SUCCESS, Message = "", Result = result };
return new BaseResponse<T> { code = ResultCode.SUCCESS, message = "", result = result };
}
/// <summary>
@ -99,7 +99,7 @@ public class BaseResponse<T> : BaseResponse
/// </summary>
public static BaseResponse<T> Success(T result, string message = "操作成功。")
{
return new BaseResponse<T> { Code = ResultCode.SUCCESS, Message = message, Result = result };
return new BaseResponse<T> { code = ResultCode.SUCCESS, message = message, result = result };
}
/// <summary>
@ -107,7 +107,7 @@ public class BaseResponse<T> : BaseResponse
/// </summary>
public static BaseResponse<T> Fail(string message = "fail")
{
return new BaseResponse<T> { Code = ResultCode.FAIL, Message = message };
return new BaseResponse<T> { code = ResultCode.FAIL, message = message };
}
/// <summary>
@ -115,12 +115,12 @@ public class BaseResponse<T> : BaseResponse
/// </summary>
public static BaseResponse<T> Fail(ResultCode code, string message = "fail")
{
return new BaseResponse<T> { Code = code, Message = message };
return new BaseResponse<T> { code = code, message = message };
}
public static BaseResponse<T> Fail(T result, string message = "操作失败,请稍后再试")
{
return new BaseResponse<T> { Code = ResultCode.FAIL, Message = message, Result = result };
return new BaseResponse<T> { code = ResultCode.FAIL, message = message, result = result };
}
/// <summary>
@ -128,7 +128,7 @@ public class BaseResponse<T> : BaseResponse
/// </summary>
public static BaseResponse<T> AuthFail(string message = "Permission authentication failed")
{
return new BaseResponse<T> { Code = ResultCode.OAUTH_FAIL, Message = message };
return new BaseResponse<T> { code = ResultCode.OAUTH_FAIL, message = message };
}
///// <summary>
@ -149,7 +149,7 @@ public class BaseResponse<T> : BaseResponse
/// <summary>
/// 操作结果
/// </summary>
public bool IsSuccess => Code == ResultCode.SUCCESS;
public bool isSuccess => code == ResultCode.SUCCESS;
}

View File

@ -0,0 +1,96 @@
using QYZH.InteractiveMagazine.Models.Enum;
namespace QYZH.InteractiveMagazine.Models.Dto.CheckIn;
/// <summary>
/// 签到配置创建/更新输入
/// </summary>
public class CheckInConfigInput
{
/// <summary>
/// 连续签到天数
/// </summary>
public int DayNumber { get; set; }
/// <summary>
/// 奖励积分数
/// </summary>
public int RewardPoints { get; set; }
/// <summary>
/// 额外奖励积分
/// </summary>
public int BonusPoints { get; set; }
/// <summary>
/// 配置类型: Daily, Streak
/// </summary>
public CheckInConfigTypeEnum Type { get; set; } = CheckInConfigTypeEnum.Daily;
}
/// <summary>
/// 签到配置输出
/// </summary>
public class CheckInConfigOutput
{
/// <summary>
/// 主键ID
/// </summary>
public long Id { get; set; }
/// <summary>
/// 连续签到天数
/// </summary>
public int DayNumber { get; set; }
/// <summary>
/// 奖励积分数
/// </summary>
public int RewardPoints { get; set; }
/// <summary>
/// 额外奖励积分
/// </summary>
public int BonusPoints { get; set; }
/// <summary>
/// 配置类型: Daily, Streak
/// </summary>
public CheckInConfigTypeEnum Type { get; set; }
/// <summary>
/// 状态
/// </summary>
public int Status { get; set; }
/// <summary>
/// 创建人
/// </summary>
public string? CreatedBy { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreatedAt { get; set; }
/// <summary>
/// 更新人
/// </summary>
public string? UpdatedBy { get; set; }
/// <summary>
/// 更新时间
/// </summary>
public DateTime? UpdatedAt { get; set; }
}
/// <summary>
/// 签到配置分页查询输入
/// </summary>
public class CheckInConfigQueryInput : PageQueryModel
{
/// <summary>
/// 配置类型筛选: Daily, Streak
/// </summary>
public CheckInConfigTypeEnum? Type { get; set; }
}

View File

@ -94,6 +94,17 @@ public class CheckInInfoOutput
public List<CheckInRecordOutput> RecentRecords { get; set; } = [];
}
/// <summary>
/// 补签输入
/// </summary>
public class MakeUpCheckInInput
{
/// <summary>
/// 补签目标日期yyyy-MM-dd
/// </summary>
public DateTime TargetDate { get; set; }
}
/// <summary>
/// 签到记录输出
/// </summary>
@ -108,6 +119,10 @@ public class CheckInRecordOutput
/// 签到日期
/// </summary>
public DateTime CheckInDate { get; set; }
/// <summary>
/// 签到时间
/// </summary>
public DateTime CreatedAt { get; set; }
/// <summary>
/// 连续签到天数

View File

@ -52,6 +52,16 @@ public class ProductInput
/// 库存(-1无限)
/// </summary>
public int Stock { get; set; } = -1;
/// <summary>
/// 是否是虚拟商品
/// </summary>
public bool IsVirtual { get; set; }
/// <summary>
/// Type对应的Id
/// </summary>
public long TypeId { get; set; }
}
/// <summary>
@ -128,6 +138,16 @@ public class ProductOutput
/// 更新时间
/// </summary>
public DateTime? UpdatedAt { get; set; }
/// <summary>
/// 是否是虚拟商品
/// </summary>
public bool IsVirtual { get; set; }
/// <summary>
/// Type对应的Id
/// </summary>
public long TypeId { get; set; }
}
/// <summary>

View File

@ -12,6 +12,16 @@ public class WxProductOutput
public int Price { get; set; }
public string Type { get; set; } = string.Empty;
/// <summary>
/// 是否是虚拟商品
/// </summary>
public bool IsVirtual { get; set; }
/// <summary>
/// Type对应的Id
/// </summary>
public long TypeId { get; set; }
/// <summary>
/// 皮肤信息(仅 PetBg 类型有值)
/// </summary>

View File

@ -0,0 +1,17 @@
namespace QYZH.InteractiveMagazine.Models.Dto;
/// <summary>
/// 下拉列表选项基类
/// </summary>
public class SelectOptionDto
{
/// <summary>
/// 选项Id
/// </summary>
public long Id { get; set; }
/// <summary>
/// 选项显示名称
/// </summary>
public string Name { get; set; } = string.Empty;
}

View File

@ -1,7 +1,3 @@
using QYZH.InteractiveMagazine.Models.Dto.CheckIn;
using QYZH.InteractiveMagazine.Models.Dto.Compensation;
using QYZH.InteractiveMagazine.Models.Dto.Points;
namespace QYZH.InteractiveMagazine.Models.Dto;
/// <summary>
@ -62,7 +58,7 @@ public class UsersOutput
}
/// <summary>
/// 用户详情输出DTO包含基本信息、积分记录、签到记录、补偿任务、期刊列表
/// 用户详情输出DTO基本信息)
/// </summary>
public class UserDetailOutput
{
@ -70,26 +66,6 @@ public class UserDetailOutput
/// 用户基本信息
/// </summary>
public UsersOutput BasicInfo { get; set; } = new();
/// <summary>
/// 积分使用记录最近20条
/// </summary>
public List<PointsRecordOutput> PointsRecords { get; set; } = [];
/// <summary>
/// 签到记录最近30条
/// </summary>
public List<CheckInRecordOutput> CheckInRecords { get; set; } = [];
/// <summary>
/// 失败的补偿任务(需要手动处理)
/// </summary>
public List<CompensationTaskOutput> FailedCompensationTasks { get; set; } = [];
/// <summary>
/// 用户拥有的期刊列表
/// </summary>
public List<UserJournalItemOutput> Journals { get; set; } = [];
}
/// <summary>

View File

@ -36,10 +36,15 @@ public class WeChatQuickLoginInput
public class WeChatLoginOutput
{
/// <summary>
/// 访问令牌(基于 WxUser,不绑定具体 User
/// 访问令牌(同时携带 WxUserId 和当前激活 UserId
/// </summary>
public string Token { get; set; } = string.Empty;
/// <summary>
/// 当前激活用户IDUsers.Id无用户时为 0
/// </summary>
public long CurrentUserId { get; set; }
/// <summary>
/// 微信用户信息
/// </summary>
@ -171,10 +176,26 @@ public class WeChatSwitchUserInput
}
/// <summary>
/// 微信切换用户输出JWT 基于 WxUser切换不更换 Token
/// 修改家长名字输入
/// </summary>
public class UpdateWxUserNameInput
{
/// <summary>
/// 新名字
/// </summary>
public string Name { get; set; } = string.Empty;
}
/// <summary>
/// 微信切换用户输出(重新生成 Token切换激活用户
/// </summary>
public class WeChatSwitchUserOutput
{
/// <summary>
/// 新的访问令牌(指向切换后的用户)
/// </summary>
public string Token { get; set; } = string.Empty;
/// <summary>
/// 当前切换的用户详情
/// </summary>