glz/QYZH.InteractiveMagazine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 完善枚举系统与状态类型转换，新增枚举管理接口

Browse Source 
1. 为所有枚举添加Description特性用于中文描述
2. 移除实体类中冗余的状态字段注释与定义
3. 将所有枚举状态参数改为int类型转换，统一数据交互格式
4. 新增系统管理枚举查询接口与实现，支持获取所有枚举元数据
5. 调整宠物服务模板状态更新接口参数类型
This commit is contained in:
glz
2026-06-08 17:54:36 +08:00
parent 78b686f9e5
commit 0126c6b097
81 changed files with 470 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
QYZH.InteractiveMagazine.Service/CheckInService.cs
View File

@ -117,7 +117,7 @@ public class CheckInService(
});
// 7. 如果用户有活跃宠物，调用 PetService 喂养（含进化检查），独立事务
if (pet != null && pet.Status == UserPetStatusEnum.Active && growthReward > 0)
if (pet != null && pet.Status == (int)UserPetStatusEnum.Active && growthReward > 0)
{
try
{
@ -315,7 +315,7 @@ public class CheckInService(
});
// 如果有活跃宠物，喂养成长值
if (pet != null && pet.Status == UserPetStatusEnum.Active && growthReward > 0)
if (pet != null && pet.Status == (int)UserPetStatusEnum.Active && growthReward > 0)
{
try
{
@ -391,7 +391,7 @@ public class CheckInService(
{
// 查询签到配置（按 DayNumber 升序）
var configs = await checkInRecordRepository.Context.Queryable<CheckInConfig>()
.Where(c => c.Status == CheckInConfigStatusEnum.Active && !c.IsDeleted)
.Where(c => c.Status == (int)CheckInConfigStatusEnum.Active && !c.IsDeleted)
.OrderBy(c => c.DayNumber)
.ToListAsync();

14
QYZH.InteractiveMagazine.Service/CompensationManageService.cs
View File

@ -37,7 +37,7 @@ public class CompensationManageService(
.LeftJoin<Users>((t, u) => t.UserId == u.Id)
.WhereIF(input.UserId.HasValue, (t, u) => t.UserId == input.UserId.Value)
.WhereIF(input.TaskType.HasValue, (t, u) => t.TaskType == (int)input.TaskType.Value)
.WhereIF(input.Status.HasValue, (t, u) => t.Status == input.Status.Value)
.WhereIF(input.Status.HasValue, (t, u) => t.Status == (int)input.Status)
.WhereIF(!string.IsNullOrWhiteSpace(input.BusinessSource), (t, u) => t.BusinessSource == input.BusinessSource)
.OrderByDescending((t, u) => t.CreatedAt)
.Select((t, u) => new CompensationManageOutput
@ -53,7 +53,7 @@ public class CompensationManageService(
ErrorSource = t.ErrorSource,
RetryCount = t.RetryCount,
MaxRetries = t.MaxRetries,
Status = t.Status,
Status = (CompensationTaskStatusEnum)t.Status,
ProcessedAt = t.ProcessedAt,
ScheduledAt = t.ScheduledAt,
ResultMessage = t.ResultMessage,
@ -75,12 +75,12 @@ public class CompensationManageService(
if (task == null)
throw new BusinessException("补偿任务不存在", 404);
if (task.Status != CompensationTaskStatusEnum.Failed && task.Status != CompensationTaskStatusEnum.Cancelled)
if (task.Status != (int)CompensationTaskStatusEnum.Failed && task.Status != (int)CompensationTaskStatusEnum.Cancelled)
throw new BusinessException($"只有失败或已取消的任务才能重试，当前状态: {task.Status}", 400);
// 重置任务状态为 Pending，清零重试次数，设置立即执行
await compensationTaskRepository.Context.Updateable<CompensationTask>()
.SetColumns(t => t.Status == CompensationTaskStatusEnum.Pending)
.SetColumns(t => t.Status == (int)CompensationTaskStatusEnum.Pending)
.SetColumns(t => t.RetryCount == 0)
.SetColumns(t => t.ScheduledAt == DateTime.Now)
.SetColumns(t => t.ResultMessage == $"管理员手动重试: {input.Reason}")
@ -118,12 +118,12 @@ public class CompensationManageService(
if (task == null)
throw new BusinessException("补偿任务不存在", 404);
if (task.Status == CompensationTaskStatusEnum.Success)
if (task.Status == (int)CompensationTaskStatusEnum.Success)
throw new BusinessException("该任务已经是成功状态，无需标记", 400);
// 标记为 Success
await compensationTaskRepository.Context.Updateable<CompensationTask>()
.SetColumns(t => t.Status == CompensationTaskStatusEnum.Success)
.SetColumns(t => t.Status == (int)CompensationTaskStatusEnum.Success)
.SetColumns(t => t.ResultMessage == $"管理员手动标记已解决: {input.ResolveNote}")
.SetColumns(t => t.ProcessedAt == DateTime.Now)
.SetColumns(t => t.UpdatedBy == operatorName)
@ -172,7 +172,7 @@ public class CompensationManageService(
ErrorSource = t.ErrorSource,
RetryCount = t.RetryCount,
MaxRetries = t.MaxRetries,
Status = t.Status,
Status = (CompensationTaskStatusEnum)t.Status,
ProcessedAt = t.ProcessedAt,
ScheduledAt = t.ScheduledAt,
ResultMessage = t.ResultMessage,

16
QYZH.InteractiveMagazine.Service/CompensationTaskService.cs
View File

@ -38,7 +38,7 @@ public class CompensationTaskService(
ErrorSource = input.ErrorSource,
RetryCount = 0,
MaxRetries = input.MaxRetries > 0 ? input.MaxRetries : 3,
Status = CompensationTaskStatusEnum.Pending,
Status = (int)CompensationTaskStatusEnum.Pending,
ScheduledAt = DateTime.Now,
IsDeleted = false,
CreatedBy = "System",
@ -62,7 +62,7 @@ public class CompensationTaskService(
var now = DateTime.Now;
var tasks = await taskRepository.Queryable()
.Where(t => (t.Status == CompensationTaskStatusEnum.Pending || t.Status == CompensationTaskStatusEnum.Processing)
.Where(t => (t.Status == (int)CompensationTaskStatusEnum.Pending || t.Status == (int)CompensationTaskStatusEnum.Processing)
&& !t.IsDeleted
&& (t.ScheduledAt == null || t.ScheduledAt <= now))
.OrderBy(t => t.CreatedAt)
@ -79,7 +79,7 @@ public class CompensationTaskService(
ErrorSource = t.ErrorSource,
RetryCount = t.RetryCount,
MaxRetries = t.MaxRetries,
Status = t.Status,
Status = (CompensationTaskStatusEnum)t.Status,
ProcessedAt = t.ProcessedAt,
ScheduledAt = t.ScheduledAt,
ResultMessage = t.ResultMessage,
@ -99,10 +99,10 @@ public class CompensationTaskService(
.Where(t => !t.IsDeleted);
if (input.Status.HasValue)
query = query.Where(t => t.Status == input.Status.Value);
query = query.Where(t => t.Status == (int)input.Status);
if (input.TaskType.HasValue)
query = query.Where(t => t.TaskType == (int)input.TaskType.Value);
query = query.Where(t => t.TaskType == (int)input.TaskType);
if (!string.IsNullOrEmpty(input.BusinessSource))
query = query.Where(t => t.BusinessSource == input.BusinessSource);
@ -122,7 +122,7 @@ public class CompensationTaskService(
ErrorSource = t.ErrorSource,
RetryCount = t.RetryCount,
MaxRetries = t.MaxRetries,
Status = t.Status,
Status = (CompensationTaskStatusEnum)t.Status,
ProcessedAt = t.ProcessedAt,
ScheduledAt = t.ScheduledAt,
ResultMessage = t.ResultMessage,
@ -139,7 +139,7 @@ public class CompensationTaskService(
public async Task UpdateTaskStatusAsync(long taskId, UpdateCompensationStatusInput input)
{
var update = taskRepository.Context.Updateable<CompensationTask>()
.SetColumns(t => t.Status == input.Status)
.SetColumns(t => t.Status == (int)input.Status)
.SetColumns(t => t.ResultMessage == input.ResultMessage)
.SetColumns(t => t.ProcessedAt == DateTime.Now)
.SetColumns(t => t.UpdatedAt == DateTime.Now);
@ -163,7 +163,7 @@ public class CompensationTaskService(
public async Task CancelTaskAsync(long taskId, string reason)
{
await taskRepository.Context.Updateable<CompensationTask>()
.SetColumns(t => t.Status == CompensationTaskStatusEnum.Cancelled)
.SetColumns(t => t.Status == (int)CompensationTaskStatusEnum.Cancelled)
.SetColumns(t => t.ResultMessage == reason)
.SetColumns(t => t.UpdatedAt == DateTime.Now)
.Where(t => t.Id == taskId && !t.IsDeleted)

8
QYZH.InteractiveMagazine.Service/MedalService.cs
View File

@ -314,7 +314,7 @@ public class MedalService(BaseRepository<Medal> medalRepository, ILogger<MedalSe
.ToListAsync();
var userMedals = await Context.Queryable<UserMedal>()
.Where(um => um.UserId == userId && um.Status == UserMedalStatusEnum.Awarded)
.Where(um => um.UserId == userId && um.Status == (int)UserMedalStatusEnum.Awarded)
.ToListAsync();
var userMedalDict = userMedals.ToDictionary(um => um.MedalId, um => um.AwardedAt);
@ -341,7 +341,7 @@ public class MedalService(BaseRepository<Medal> medalRepository, ILogger<MedalSe
var result = await Context.Queryable<UserMedal>()
.InnerJoin<Medal>((um, m) => um.MedalId == m.Id)
.Where((um, m) => um.UserId == userId && um.Status == UserMedalStatusEnum.Awarded)
.Where((um, m) => um.UserId == userId && um.Status == (int)UserMedalStatusEnum.Awarded)
.OrderByDescending((um, m) => um.AwardedAt)
.Select((um, m) => new WxUserMedalOutput
{
@ -391,7 +391,7 @@ public class MedalService(BaseRepository<Medal> medalRepository, ILogger<MedalSe
}
var existingUserMedal = await Context.Queryable<UserMedal>()
.Where(um => um.UserId == userId && um.MedalId == (int)input.MedalId && um.Status == UserMedalStatusEnum.Awarded)
.Where(um => um.UserId == userId && um.MedalId == (int)input.MedalId && um.Status == (int)UserMedalStatusEnum.Awarded)
.FirstAsync();
if (existingUserMedal != null)
@ -405,7 +405,7 @@ public class MedalService(BaseRepository<Medal> medalRepository, ILogger<MedalSe
MedalId = (int)input.MedalId,
AwardedAt = DateTime.Now,
Type = (UserMedalTypeEnum)medal.Type,
Status = UserMedalStatusEnum.Awarded,
Status = (int)UserMedalStatusEnum.Awarded,
CreatedBy = "System",
UpdatedBy = "System",
CreatedAt = DateTime.Now,

24
QYZH.InteractiveMagazine.Service/PetService.cs
View File

@ -109,7 +109,7 @@ public class PetService(
// 查询默认宠物模板（取排序权重最低且状态为Active的模板）
var defaultTemplate = await petTemplateRepository.Queryable()
.Where(t => t.Status == PetTemplateStatusEnum.Active && !t.IsDeleted)
.Where(t => t.Status == (int)PetTemplateStatusEnum.Active && !t.IsDeleted)
.OrderBy(t => t.SortOrder)
.FirstAsync();
@ -123,7 +123,7 @@ public class PetService(
var initialEvolution = await petEvolutionRepository.Queryable()
.Where(e => e.TemplateId == defaultTemplate.Id
&& e.PreviousEvolutionId == null
&& e.Status == PetEvolutionStatusEnum.Active)
&& e.Status == (int)PetEvolutionStatusEnum.Active)
.OrderBy(e => e.StageLevel)
.FirstAsync();
@ -137,7 +137,7 @@ public class PetService(
FeedingCount = 0,
CurrentSkinId = 0,
Type = UserPetTypeEnum.Normal,
Status = UserPetStatusEnum.Inactive,
Status = (int)UserPetStatusEnum.Inactive,
IsDeleted = false,
CreatedBy = userId.ToString(),
CreatedAt = DateTime.Now,
@ -173,14 +173,14 @@ public class PetService(
return;
}
if (pet.Status != UserPetStatusEnum.Inactive)
if (pet.Status != (int)UserPetStatusEnum.Inactive)
{
logger.LogInformation("用户宠物已非未激活状态，跳过激活，UserId: {UserId}, Status: {Status}", userId, pet.Status);
return;
}
var result = await petRepository.UpdateAsync(
p => new UserPet { Status = UserPetStatusEnum.Active },
p => new UserPet { Status = (int)UserPetStatusEnum.Active },
p => p.UserId == userId);
if (!result)
@ -226,7 +226,7 @@ public class PetService(
}
// 校验宠物状态
if (pet.Status != UserPetStatusEnum.Active)
if (pet.Status != (int)UserPetStatusEnum.Active)
{
logger.LogWarning("喂养失败，宠物未激活，PetId: {PetId}, Status: {Status}", input.PetId, pet.Status);
throw new BusinessException("宠物未激活，无法喂养", 400);
@ -258,7 +258,7 @@ public class PetService(
var nextEvolution = await petEvolutionRepository.Queryable()
.Where(e => e.PreviousEvolutionId == pet.CurrentEvolutionId
&& e.RequiredGrowth <= growthAfter
&& e.Status == PetEvolutionStatusEnum.Active)
&& e.Status == (int)PetEvolutionStatusEnum.Active)
.OrderBy(e => e.RequiredGrowth, OrderByType.Desc)
.FirstAsync();
@ -291,7 +291,7 @@ public class PetService(
GrowthBefore = growthBefore,
GrowthAfter = growthAfter,
Type = PetFeedingRecordTypeEnum.Normal,
Status = PetFeedingRecordStatusEnum.Success,
Status = (int)PetFeedingRecordStatusEnum.Success,
IsDeleted = false,
CreatedBy = userId.ToString(),
CreatedAt = DateTime.Now,
@ -367,7 +367,7 @@ public class PetService(
IconUrl = input.IconUrl,
SortOrder = input.SortOrder,
Type = Enum.Parse<PetTemplateTypeEnum>(input.Type, true),
Status = PetTemplateStatusEnum.Active,
Status = (int)PetTemplateStatusEnum.Active,
CreatedBy = "System",
CreatedAt = DateTime.Now,
UpdatedBy = "System",
@ -484,13 +484,13 @@ public class PetService(
/// <summary>
/// 更新模板状态（启用/禁用）
/// </summary>
public async Task UpdateTemplateStatusAsync(long id, string status)
public async Task UpdateTemplateStatusAsync(long id, int status)
{
var template = await petTemplateRepository.GetByIdAsync(id);
if (template == null || template.IsDeleted)
throw new BusinessException("宠物模板不存在", 404);
template.Status = Enum.Parse<PetTemplateStatusEnum>(status, true);
template.Status = status;
template.UpdatedBy = "System";
template.UpdatedAt = DateTime.Now;
await petTemplateRepository.UpdateAsync(template);
@ -548,7 +548,7 @@ public class PetService(
BaseIntelligence = input.BaseIntelligence,
BaseCharm = input.BaseCharm,
Type = Enum.Parse<PetEvolutionTypeEnum>(input.Type, true),
Status = PetEvolutionStatusEnum.Active,
Status = (int)PetEvolutionStatusEnum.Active,
CreatedBy = "System",
CreatedAt = DateTime.Now,
UpdatedBy = "System",

8
QYZH.InteractiveMagazine.Service/PointsService.cs
View File

@ -101,7 +101,7 @@ public class PointsService(
RelatedId = input.RelatedId,
Description = input.Description,
Type = PointsFlowTypeEnum.Income,
Status = PointsRecordStatusEnum.Success,
Status = (int)PointsRecordStatusEnum.Success,
IsDeleted = false,
CreatedBy = input.OperatorName ?? user.Name ?? input.UserId.ToString(),
CreatedAt = DateTime.Now,
@ -164,7 +164,7 @@ public class PointsService(
RelatedId = input.RelatedId,
Description = input.Description,
Type = PointsFlowTypeEnum.Expense,
Status = PointsRecordStatusEnum.Success,
Status = (int)PointsRecordStatusEnum.Success,
IsDeleted = false,
CreatedBy = input.OperatorName ?? user.Name ?? input.UserId.ToString(),
CreatedAt = DateTime.Now,
@ -218,12 +218,12 @@ public class PointsService(
// 查询累计收入（Income 类型）
var totalIncome = await Context.Queryable<PointsRecord>()
.Where(r => r.UserId == userId && !r.IsDeleted && r.Type == PointsFlowTypeEnum.Income && r.Status == PointsRecordStatusEnum.Success)
.Where(r => r.UserId == userId && !r.IsDeleted && r.Type == PointsFlowTypeEnum.Income && r.Status == (int)PointsRecordStatusEnum.Success)
.SumAsync(r => r.ChangeAmount);
// 查询累计支出（Expense 类型，取绝对值）
var totalExpense = await Context.Queryable<PointsRecord>()
.Where(r => r.UserId == userId && !r.IsDeleted && r.Type == PointsFlowTypeEnum.Expense && r.Status == PointsRecordStatusEnum.Success)
.Where(r => r.UserId == userId && !r.IsDeleted && r.Type == PointsFlowTypeEnum.Expense && r.Status == (int)PointsRecordStatusEnum.Success)
.SumAsync(r => r.ChangeAmount);
return new PointsSummaryOutput

73
QYZH.InteractiveMagazine.Service/SystemManagementService.cs Normal file
View File

@ -0,0 +1,73 @@
using System.ComponentModel;
using System.Reflection;
using Microsoft.Extensions.Logging;
using QYZH.InteractiveMagazine.IService;
using QYZH.InteractiveMagazine.Models.Dto.SystemManagement;
namespace QYZH.InteractiveMagazine.Service;
/// <summary>
/// 系统管理服务实现
/// </summary>
public class SystemManagementService : ISystemManagementService
{
private readonly ILogger<SystemManagementService> _logger;
public SystemManagementService(ILogger<SystemManagementService> logger)
{
_logger = logger;
}
public Task<List<EnumInfoOutput>> GetAllEnumsAsync()
{
_logger.LogInformation("开始获取所有枚举信息");
var enumAssembly = typeof(QYZH.InteractiveMagazine.Models.Enum.AdminUserStatusEnum).Assembly;
var enumNamespace = "QYZH.InteractiveMagazine.Models.Enum";
var enumTypes = enumAssembly.GetTypes()
.Where(t => t.IsEnum && t.Namespace == enumNamespace)
.OrderBy(t => t.Name)
.ToList();
var result = new List<EnumInfoOutput>();
foreach (var enumType in enumTypes)
{
var enumInfo = new EnumInfoOutput
{
EnumName = enumType.Name
};
var fields = Enum.GetValues(enumType)
.Cast<object>()
.Select(value => new
{
Name = Enum.GetName(enumType, value),
Value = Convert.ToInt32(value),
Field = enumType.GetField(value.ToString()!)
})
.ToList();
foreach (var field in fields)
{
var description = field.Field?
.GetCustomAttribute<DescriptionAttribute>()?
.Description;
enumInfo.Items.Add(new EnumItemDto
{
Name = field.Name!,
Value = field.Value,
Description = description
});
}
result.Add(enumInfo);
}
_logger.LogInformation("获取枚举信息完成，共 {Count} 个枚举", result.Count);
return Task.FromResult(result);
}
}

4
QYZH.InteractiveMagazine.Service/UserJournalService.cs
View File

@ -50,7 +50,7 @@ public class UserJournalService(
}
// 校验期刊状态
if (journal.Status != JournalStatusEnum.Published)
if (journal.Status != (int)JournalStatusEnum.Published)
{
logger.LogWarning("绑定期刊失败，期刊未发布，JournalId: {JournalId}, Status: {Status}", input.JournalId, journal.Status);
throw new BusinessException("该期刊暂未发布，无法绑定", 400);
@ -77,7 +77,7 @@ public class UserJournalService(
JournalId = input.JournalId,
Id = input.Id,
Type = Enum.Parse<UserJournalTypeEnum>(input.Type, true),
Status = UserJournalStatusEnum.Active,
Status = (int)UserJournalStatusEnum.Active,
IsDeleted = false,
CreatedBy = userId.ToString(),
CreatedAt = DateTime.Now,

2
QYZH.InteractiveMagazine.Service/UsersService.cs
View File

@ -180,7 +180,7 @@ public class UsersService(
var statusValue = input.Status == 1 ? UserStatusEnum.Active : UserStatusEnum.Disabled;
var result = await UpdateAsync(
u => new Users { Status = statusValue },
u => new Users { Status = (int)statusValue },
u => u.Id == id
);

4
QYZH.InteractiveMagazine.Service/WeChatAuthService.cs
View File

@ -72,7 +72,7 @@ public class WeChatAuthService(BaseRepository<Users> usersRepository, IConfigura
UnionId = wxResponse.UnionId,
Phone = phone,
Type = UsersTypeEnum.Normal,
Status = UserStatusEnum.Active,
Status = (int)UserStatusEnum.Active,
GrowthPoints = 0,
Points = 0,
IsLastOnline = true
@ -190,7 +190,7 @@ public class WeChatAuthService(BaseRepository<Users> usersRepository, IConfigura
throw new BusinessException("无法切换到该用户", 403);
}
if (targetUser.Status == UserStatusEnum.Disabled)
if (targetUser.Status == (int)UserStatusEnum.Disabled)
{
throw new BusinessException("目标账号已被禁用", 403);
}

2
QYZH.InteractiveMagazine.Service/WeChatCommunityService.cs
View File

@ -236,7 +236,7 @@ public class WeChatCommunityService(
private async Task<List<long>> GetUserJournalIds(long userId)
{
return await Context.Queryable<UserJournal>()
.Where(uj => uj.UserId == userId && uj.Status == UserJournalStatusEnum.Active)
.Where(uj => uj.UserId == userId && uj.Status == (int)UserJournalStatusEnum.Active)
.Select(uj => uj.JournalId)
.ToListAsync();
}

18
QYZH.InteractiveMagazine.Service/WxMallService.cs
View File

@ -83,7 +83,7 @@ public class WxMallService(
var skinProductIds = skinProductMap.Select(x => x.ProductId).ToList();
var bagItems = skinProductIds.Count > 0
? await exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == UserBagStatusEnum.Available
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available
&& skinProductIds.Contains(b.ItemId))
.ToListAsync()
: new List<UserBag>();
@ -158,7 +158,7 @@ public class WxMallService(
}
var owned = await exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.UserId == userId && b.ItemId == product.Id && !b.IsDeleted && b.Status == UserBagStatusEnum.Available)
.Where(b => b.UserId == userId && b.ItemId == product.Id && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available)
.AnyAsync();
return new WxProductOutput
@ -213,7 +213,7 @@ public class WxMallService(
PointsCost = totalCost,
PointsBalance = 0, // 稍后赋值
Quantity = input.Quantity,
Status = ExchangeRecordStatusEnum.Success,
Status = (int)ExchangeRecordStatusEnum.Success,
IsDeleted = false,
CreatedBy = userId.ToString(),
CreatedAt = DateTime.Now,
@ -241,7 +241,7 @@ public class WxMallService(
// 加入背包
var existingBag = await exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.UserId == userId && b.ItemId == product.Id && !b.IsDeleted && b.Status == UserBagStatusEnum.Available)
.Where(b => b.UserId == userId && b.ItemId == product.Id && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available)
.FirstAsync();
if (existingBag != null)
@ -264,7 +264,7 @@ public class WxMallService(
Quantity = input.Quantity,
MetaData = product.MetaData,
Type = Enum.TryParse<UserBagTypeEnum>(product.Type.ToString(), out var bagType) ? bagType : default,
Status = UserBagStatusEnum.Available,
Status = (int)UserBagStatusEnum.Available,
IsDeleted = false,
CreatedBy = userId.ToString(),
CreatedAt = DateTime.Now,
@ -318,7 +318,7 @@ public class WxMallService(
public async Task<List<UserBagOutput>> GetBagItemsAsync(long userId, string? itemType = null)
{
var query = exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == UserBagStatusEnum.Available)
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available)
.WhereIF(!string.IsNullOrEmpty(itemType), b => b.ItemType == itemType)
.OrderByDescending(b => b.CreatedAt);
@ -403,7 +403,7 @@ public class WxMallService(
throw new BusinessException("背包物品Id无效", 400);
var bagItem = await exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.Id == input.BagItemId && b.UserId == userId && !b.IsDeleted && b.Status == UserBagStatusEnum.Available)
.Where(b => b.Id == input.BagItemId && b.UserId == userId && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available)
.FirstAsync();
if (bagItem == null)
@ -444,7 +444,7 @@ public class WxMallService(
if (bagItem.Quantity <= 1)
{
await exchangeRecordRepository.Context.Updateable<UserBag>()
.SetColumns(b => b.Status == UserBagStatusEnum.Expired)
.SetColumns(b => b.Status == (int)UserBagStatusEnum.Expired)
.SetColumns(b => b.Quantity == 0)
.SetColumns(b => b.UpdatedAt == DateTime.Now)
.Where(b => b.Id == bagItem.Id)
@ -507,7 +507,7 @@ public class WxMallService(
// 校验背包中是否拥有该皮肤（通过 MetaData 中的 SkinId 判断）
var hasSkin = await exchangeRecordRepository.Context.Queryable<UserBag>()
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == UserBagStatusEnum.Available && b.Quantity > 0
.Where(b => b.UserId == userId && !b.IsDeleted && b.Status == (int)UserBagStatusEnum.Available && b.Quantity > 0
&& b.ItemType == "PetBg")
.ToListAsync();