xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "feat: 支持尊享包渠道"

Browse Source 
This reverts commit 70ae2fab44.
This commit is contained in:
ccnetcore
2025-12-31 00:10:44 +08:00
parent 70ae2fab44
commit 0c31b97824
28 changed files with 34 additions and 1666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiChatService.cs
View File

@@ -109,7 +109,7 @@ public class AiChatService : ApplicationService
ApiHost = null,
ApiKey = null,
Remark = x.Description,
IsPremiumPackage = x.IsPremium
IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId)
}).ToListAsync();
return output;
}
@@ -144,21 +144,13 @@ public class AiChatService : ApplicationService
}
//如果是尊享包服务，需要校验是是否尊享包足够
if (CurrentUser.IsAuthenticated)
if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model))
{
var isPremium = await _aiModelRepository._DbQueryable
.Where(x => x.ModelId == input.Model)
.Select(x => x.IsPremium)
.FirstAsync();
if (isPremium)
// 检查尊享token包用量
var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
if (availableTokens <= 0)
{
// 检查尊享token包用量
var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
if (availableTokens <= 0)
{
throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
}
throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
}
}
@@ -227,12 +219,7 @@ public class AiChatService : ApplicationService
}
//如果是尊享包服务，需要校验是是否尊享包足够
var isPremium = await _aiModelRepository._DbQueryable
.Where(x => x.ModelId == input.ModelId)
.Select(x => x.IsPremium)
.FirstAsync();
if (isPremium)
if (PremiumPackageConst.ModeIds.Contains(input.ModelId))
{
// 检查尊享token包用量
var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(tokenValidation.UserId);

3
Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/AiImageService.cs
View File

@@ -69,9 +69,6 @@ public class AiImageService : ApplicationService
}
// 尊享包校验
// 注意: AiImageService目前没有注入AiModelEntity仓储
// 由于图片生成功能使用频率较低,且当前所有图片模型都不是尊享模型
// 暂时保留原逻辑,等待后续重构时再注入仓储
if (PremiumPackageConst.ModeIds.Contains(input.ModelId))
{
var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);

5
Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/ModelService.cs
View File

@@ -41,7 +41,8 @@ public class ModelService : ApplicationService, IModelService
input.ModelTypes.Contains(x.ModelType))
.WhereIF(input.ModelApiTypes is not null, x =>
input.ModelApiTypes.Contains(x.ModelApiType))
.WhereIF(input.IsPremiumOnly == true, x => x.IsPremium)
.WhereIF(input.IsPremiumOnly == true, x =>
PremiumPackageConst.ModeIds.Contains(x.ModelId))
.GroupBy(x => x.ModelId)
.Select(x => x.ModelId)
.ToPageListAsync(input.SkipCount, input.MaxResultCount, total));
@@ -60,7 +61,7 @@ public class ModelService : ApplicationService, IModelService
MultiplierShow = x.First().MultiplierShow,
ProviderName = x.First().ProviderName,
IconUrl = x.First().IconUrl,
IsPremium = x.First().IsPremium,
IsPremium = PremiumPackageConst.ModeIds.Contains(x.First().ModelId),
OrderNum = x.First().OrderNum
}).ToList();

5
Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Chat/TokenService.cs
View File

@@ -52,10 +52,7 @@ public class TokenService : ApplicationService
}
// 获取尊享包模型ID列表
var premiumModelIds = await _aiModelRepository._DbQueryable
.Where(x => x.IsPremium)
.Select(x => x.ModelId)
.ToListAsync();
var premiumModelIds = PremiumPackageConst.ModeIds;
// 批量查询所有Token的尊享包已使用额度
var tokenIds = tokens.Select(t => t.Id).ToList();