diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs index f73af213..05d6eaeb 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs @@ -125,9 +125,9 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic if (premiumPackages.Any()) { - // 过滤掉已过期的包 + // 过滤掉已过期、禁用的包,不过滤用量负数的包 var validPackages = premiumPackages - .Where(p => p.IsAvailable()) + .Where(p => p.IsAvailable(false)) .ToList(); result.PremiumTotalTokens = validPackages.Sum(x => x.TotalTokens); diff --git a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/PremiumPackageAggregateRoot.cs b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/PremiumPackageAggregateRoot.cs index 1665cdfd..e0310005 100644 --- a/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/PremiumPackageAggregateRoot.cs +++ b/Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/PremiumPackageAggregateRoot.cs @@ -86,14 +86,14 @@ public class PremiumPackageAggregateRoot : FullAuditedAggregateRoot /// 检查是否可用 /// /// 是否可用 - public bool IsAvailable() + public bool IsAvailable(bool isVerifyRemainingToken=true) { if (!IsActive) { return false; } - if (RemainingTokens <= 0) + if (isVerifyRemainingToken&&RemainingTokens <= 0) { return false; }