feat: 合并分支

# Conflicts:
#	Yi.Ai.Vue3/package.json
#	Yi.Ai.Vue3/pnpm-lock.yaml
#	Yi.Ai.Vue3/src/pages/chat/layouts/chatWithId/index.vue

.gitignore

@@ -265,6 +265,7 @@ src/Acme.BookStore.Blazor.Server.Tiered/Logs/*
 **/wwwroot/libs/*
 public
 dist
+dist - 副本
 .vscode
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Development.json
 /Yi.Abp.Net8/src/Yi.Abp.Web/appsettings.Production.json
@@ -277,3 +278,5 @@ database_backup
 /Yi.Abp.Net8/src/Yi.Abp.Web/yi-abp-dev.db
 
 package-lock.json
+
+.claude

README.md

@@ -7,6 +7,12 @@
 [![fork](https://gitee.com/ccnetcore/yi/badge/fork.svg?theme=dark)](https://gitee.com/ccnetcore/Yi)
 [![license](https://img.shields.io/badge/license-MIT-yellow)](https://gitee.com/ccnetcore/Yi)
 
+本项目 CDN 加速及安全防护由 Tencent EdgeOne 赞助
+
+[亚洲最佳CDN、边缘和安全解决方案 - Tencent EdgeOne](https://edgeone.ai/zh?from=github)
+
+<img src="readme/edgeone.png"/>
+
 [English](README-en.md) | 简体中文
 ****
 ##  🍍  简介:
@@ -60,9 +66,9 @@ bbs前端：`docker run -d --name yi.bbs -p 18001:18001 -v /home/Yi/Yi.Bbs.Vue3/
 
 Yi社区官网网址（Bbs社区正式）：[ccnetcore.com](https://ccnetcore.com)  (已上线，欢迎加入)
 
-Rbac后台演示地址：https://ccnetcore.com:1000  （用户cc、密码123456）
+Rbac后台演示地址：https://data.ccnetcore.com:1000  （用户cc、密码123456）
 
-Pure后台演示地址：https://ccnetcore.com:1001  （用户cc、密码123456）
+Pure后台演示地址：https://data.ccnetcore.com:1001  （用户cc、密码123456）
 
 ##  🍏  支持:
 

Yi.Abp.Net8/.claude/settings.local.json

@@ -0,0 +1,10 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(dotnet build \"E:\\code\\github\\Yi\\Yi.Abp.Net8\\module\\ai-hub\\Yi.Framework.AiHub.Application\\Yi.Framework.AiHub.Application.csproj\" --no-restore)",
+      "Read(//e/code/github/Yi/Yi.Ai.Vue3/**)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

Yi.Abp.Net8/common.props

@@ -12,6 +12,7 @@
 	</PropertyGroup>
 	
   <PropertyGroup>
+      <SatelliteResourceLanguages>en;zh-CN</SatelliteResourceLanguages>
     <LangVersion>latest</LangVersion>
     <Version>1.0.0</Version>
     <NoWarn>$(NoWarn);CS1591;CS8618;CS1998;CS8604;CS8620;CS8600;CS8602</NoWarn>

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/Fiters/FriendlyExceptionFilter.cs

@@ -1,4 +1,4 @@
-// MIT 许可证
+// MIT 许可证
 //
 // 版权 © 2020-present 百小僧, 百签科技（广东）有限公司 和所有贡献者
 //
@@ -17,25 +17,25 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.DependencyInjection;
+using Volo.Abp.Validation;
 using Yi.Framework.Core.Extensions;
 
 namespace Yi.Framework.AspNetCore.UnifyResult.Fiters;
 
 /// <summary>
-/// 友好异常拦截器
+///     友好异常拦截器
 /// </summary>
 public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
 {
     /// <summary>
-    /// 异常拦截
+    ///     异常拦截
     /// </summary>
     /// <param name="context"></param>
     /// <returns></returns>
     public async Task OnExceptionAsync(ExceptionContext context)
     {
-
         // 排除 WebSocket 请求处理
         if (context.HttpContext.IsWebSocketRequest()) return;
 
@@ -44,20 +44,23 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
 
         // 解析异常信息
         var exceptionMetadata = GetExceptionMetadata(context);
-        
-        IUnifyResultProvider unifyResult = context.GetRequiredService<IUnifyResultProvider>();
+        var unifyResult = context.GetRequiredService<IUnifyResultProvider>();
         // 执行规范化异常处理
         context.Result = unifyResult.OnException(context, exceptionMetadata);
-        
+
         // 创建日志记录器
         var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<FriendlyExceptionFilter>>();
 
+        var errorMsg = "";
+        if (exceptionMetadata.Errors != null) errorMsg = "\n" + JsonConvert.SerializeObject(exceptionMetadata.Errors);
+
+
         // 记录拦截日常
-        logger.LogError(context.Exception, context.Exception.Message);
+        logger.LogError(context.Exception, context.Exception.Message + errorMsg);
     }
 
     /// <summary>
-    /// 获取异常元数据
+    ///     获取异常元数据
     /// </summary>
     /// <param name="context"></param>
     /// <returns></returns>
@@ -74,22 +77,25 @@ public sealed class FriendlyExceptionFilter : IAsyncExceptionFilter
         // 判断是否是 ExceptionContext 或者 ActionExecutedContext
         var exception = context is ExceptionContext exContext
             ? exContext.Exception
-            : (
-                context is ActionExecutedContext edContext
-                    ? edContext.Exception
-                    : default
-            );
+            : context is ActionExecutedContext edContext
+                ? edContext.Exception
+                : default;
+
+        if (exception is AbpValidationException validationException)
+        {
+            errors = validationException.ValidationErrors;
+            isValidationException = true;
+        }
 
         // 判断是否是友好异常
         if (exception is UserFriendlyException friendlyException)
         {
-            int statusCode2 = 500;
+            var statusCode2 = 500;
             int.TryParse(friendlyException.Code, out statusCode2);
             isFriendlyException = true;
             errorCode = friendlyException.Code;
             originErrorCode = friendlyException.Code;
-            statusCode = statusCode2==0?403:statusCode2;
-            isValidationException = false;
+            statusCode = statusCode2 == 0 ? 403 : statusCode2;
             errors = friendlyException.Message;
             data = friendlyException.Data;
         }

Yi.Abp.Net8/framework/Yi.Framework.AspNetCore/UnifyResult/UnifyResultExtensions.cs

@@ -2,6 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using Volo.Abp.AspNetCore.Mvc.ExceptionHandling;
+using Volo.Abp.AspNetCore.Mvc.Response;
 using Yi.Framework.AspNetCore.UnifyResult.Fiters;
 
 namespace Yi.Framework.AspNetCore.UnifyResult;
@@ -20,9 +21,10 @@ public static class UnifyResultExtensions
         services.AddTransient<FriendlyExceptionFilter>();
         services.AddMvc(options =>
         {
+            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpExceptionFilter));
+            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpNoContentActionFilter));
             options.Filters.AddService<SucceededUnifyResultFilter>(99);
             options.Filters.AddService<FriendlyExceptionFilter>(100);
-            options.Filters.RemoveAll(x => (x as ServiceFilterAttribute)?.ServiceType == typeof(AbpExceptionFilter));
         });
         return services;
     }

Yi.Abp.Net8/framework/Yi.Framework.Ddd.Application/YiCrudAppService.cs

@@ -199,11 +199,11 @@ namespace Yi.Framework.Ddd.Application
         /// <summary>
         /// 批量删除实体
         /// </summary>
-        /// <param name="ids">实体ID集合</param>
+        /// <param name="id">实体ID集合</param>
         [RemoteService(isEnabled: true)]
-        public virtual async Task DeleteAsync(IEnumerable<TKey> ids)
+        public virtual async Task DeleteAsync(IEnumerable<TKey> id)
         {
-            await Repository.DeleteManyAsync(ids);
+            await Repository.DeleteManyAsync(id);
         }
 
         /// <summary>

Yi.Abp.Net8/framework/Yi.Framework.Mapster/YiFrameworkMapsterModule.cs

@@ -1,7 +1,8 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectMapping;
 using Yi.Framework.Core;
+using Mapster;
 
 namespace Yi.Framework.Mapster
 {
@@ -22,7 +23,8 @@ namespace Yi.Framework.Mapster
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var services = context.Services;
-
+            // 扫描并注册所有映射配置 
+            TypeAdapterConfig.GlobalSettings.Scan(AppDomain.CurrentDomain.GetAssemblies());
             // 注册Mapster相关服务
             services.AddTransient<IAutoObjectMappingProvider, MapsterAutoObjectMappingProvider>();
             services.AddTransient<IObjectMapper, MapsterObjectMapper>();

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore.Abstractions/DbConnOptions.cs

@@ -60,8 +60,8 @@ namespace Yi.Framework.SqlSugarCore.Abstractions
         public bool EnabledSaasMultiTenancy { get; set; } = false;
 
         /// <summary>
-        /// 并发乐观锁异常，否则不处理
+        /// 是否开启更新并发乐观锁
         /// </summary>
-        public bool EnabledConcurrencyException { get; set; } = true;
+        public bool EnabledConcurrencyException { get;set; } = false;
     }
 }

Yi.Abp.Net8/framework/Yi.Framework.SqlSugarCore/Repositories/SqlSugarRepository.cs

@@ -1,12 +1,7 @@
-using System.Linq;
 using System.Linq.Expressions;
-using System.Text;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Nito.AsyncEx;
 using SqlSugar;
-using Volo.Abp;
-using Volo.Abp.Auditing;
 using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
@@ -17,18 +12,19 @@ using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.SqlSugarCore.Repositories
 {
-    public class SqlSugarRepository<TEntity> : ISqlSugarRepository<TEntity>, IRepository<TEntity>
-        where TEntity : class, IEntity, new()
+    public class SqlSugarRepository<TEntity> : ISqlSugarRepository<TEntity>, IRepository<TEntity> where TEntity : class, IEntity, new()
     {
+        [Obsolete("使用GetDbContextAsync()")]
         public ISqlSugarClient _Db => AsyncContext.Run(async () => await GetDbContextAsync());
 
+        [Obsolete("使用AsQueryable()")]
         public ISugarQueryable<TEntity> _DbQueryable => _Db.Queryable<TEntity>();
 
         private readonly ISugarDbContextProvider<ISqlSugarDbContext> _dbContextProvider;
-
+        
         public IAbpLazyServiceProvider LazyServiceProvider { get; set; }
+        
         protected DbConnOptions? Options => LazyServiceProvider?.LazyGetService<IOptions<DbConnOptions>>().Value;
-
         /// <summary>
         /// 异步查询执行器
         /// </summary>
@@ -64,26 +60,22 @@ namespace Yi.Framework.SqlSugarCore.Repositories
 
         #region Abp模块
 
-        public virtual async Task<TEntity?> FindAsync(Expression<Func<TEntity, bool>> predicate,
-            bool includeDetails = true, CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity?> FindAsync(Expression<Func<TEntity, bool>> predicate, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
             return await GetFirstAsync(predicate);
         }
 
-        public virtual async Task<TEntity> GetAsync(Expression<Func<TEntity, bool>> predicate,
-            bool includeDetails = true, CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity> GetAsync(Expression<Func<TEntity, bool>> predicate, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
             return await GetFirstAsync(predicate);
         }
 
-        public virtual async Task DeleteAsync(Expression<Func<TEntity, bool>> predicate, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteAsync(Expression<Func<TEntity, bool>> predicate, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await this.DeleteAsync(predicate);
         }
 
-        public virtual async Task DeleteDirectAsync(Expression<Func<TEntity, bool>> predicate,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteDirectAsync(Expression<Func<TEntity, bool>> predicate, CancellationToken cancellationToken = default)
         {
             await this.DeleteAsync(predicate);
         }
@@ -113,71 +105,60 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             throw new NotImplementedException();
         }
 
-        public virtual async Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> predicate,
-            bool includeDetails = false, CancellationToken cancellationToken = default)
+        public virtual async Task<List<TEntity>> GetListAsync(Expression<Func<TEntity, bool>> predicate, bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return await GetListAsync(predicate);
         }
 
-        public virtual async Task<TEntity> InsertAsync(TEntity entity, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity> InsertAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             return await InsertReturnEntityAsync(entity);
         }
 
-        public virtual async Task InsertManyAsync(IEnumerable<TEntity> entities, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task InsertManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await InsertRangeAsync(entities.ToList());
         }
 
-        public virtual async Task<TEntity> UpdateAsync(TEntity entity, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity> UpdateAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await UpdateAsync(entity);
             return entity;
         }
 
-        public virtual async Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task UpdateManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await UpdateRangeAsync(entities.ToList());
         }
 
-        public virtual async Task DeleteAsync(TEntity entity, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteAsync(TEntity entity, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await DeleteAsync(entity);
         }
 
-        public virtual async Task DeleteManyAsync(IEnumerable<TEntity> entities, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteManyAsync(IEnumerable<TEntity> entities, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await DeleteAsync(entities.ToList());
         }
 
-        public virtual async Task<List<TEntity>> GetListAsync(bool includeDetails = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task<List<TEntity>> GetListAsync(bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return await GetListAsync();
         }
 
         public virtual async Task<long> GetCountAsync(CancellationToken cancellationToken = default)
         {
-            return await this.CountAsync(_ => true);
+            return await this.CountAsync(_=>true);
         }
 
-        public virtual async Task<List<TEntity>> GetPagedListAsync(int skipCount, int maxResultCount, string sorting,
-            bool includeDetails = false, CancellationToken cancellationToken = default)
+        public virtual async Task<List<TEntity>> GetPagedListAsync(int skipCount, int maxResultCount, string sorting, bool includeDetails = false, CancellationToken cancellationToken = default)
         {
             return await GetPageListAsync(_ => true, skipCount, maxResultCount);
         }
-
         #endregion
 
 
         #region 内置DB快捷操作
-
         public virtual async Task<IDeleteable<TEntity>> AsDeleteable()
         {
             return (await GetDbSimpleClientAsync()).AsDeleteable();
@@ -192,7 +173,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories
         {
             return (await GetDbSimpleClientAsync()).AsInsertable(insertObj);
         }
-
+        
         public virtual async Task<IInsertable<TEntity>> AsInsertable(TEntity[] insertObjs)
         {
             return (await GetDbSimpleClientAsync()).AsInsertable(insertObjs);
@@ -232,11 +213,9 @@ namespace Yi.Framework.SqlSugarCore.Repositories
         {
             return (await GetDbSimpleClientAsync()).AsUpdateable(updateObjs);
         }
-
         #endregion
 
         #region SimpleClient模块
-
         public virtual async Task<int> CountAsync(Expression<Func<TEntity, bool>> whereExpression)
         {
             return await (await GetDbSimpleClientAsync()).CountAsync(whereExpression);
@@ -253,6 +232,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             {
                 return await (await GetDbSimpleClientAsync()).DeleteAsync(deleteObj);
             }
+
         }
 
         public virtual async Task<bool> DeleteAsync(List<TEntity> deleteObjs)
@@ -272,13 +252,13 @@ namespace Yi.Framework.SqlSugarCore.Repositories
         {
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)))
             {
-                return await (await GetDbSimpleClientAsync()).AsUpdateable()
-                    .SetColumns(nameof(ISoftDelete.IsDeleted), true).Where(whereExpression).ExecuteCommandAsync() > 0;
+                return await (await GetDbSimpleClientAsync()).AsUpdateable().SetColumns(nameof(ISoftDelete.IsDeleted), true).Where(whereExpression).ExecuteCommandAsync() > 0;
             }
             else
             {
                 return await (await GetDbSimpleClientAsync()).DeleteAsync(whereExpression);
             }
+
         }
 
         public virtual async Task<bool> DeleteByIdAsync(dynamic id)
@@ -286,11 +266,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             if (typeof(ISoftDelete).IsAssignableFrom(typeof(TEntity)))
             {
                 var entity = await GetByIdAsync(id);
-                if (entity is null)
-                {
-                    return false;
-                }
-
+                if (entity == null) return false;
                 //反射赋值
                 ReflexHelper.SetModelValue(nameof(ISoftDelete.IsDeleted), true, entity);
                 return await UpdateAsync(entity);
@@ -311,7 +287,6 @@ namespace Yi.Framework.SqlSugarCore.Repositories
                 {
                     return false;
                 }
-
                 //反射赋值
                 entities.ForEach(e => ReflexHelper.SetModelValue(nameof(ISoftDelete.IsDeleted), true, e));
                 return await UpdateRangeAsync(entities);
@@ -320,6 +295,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             {
                 return await (await GetDbSimpleClientAsync()).DeleteByIdAsync(ids);
             }
+
         }
 
         public virtual async Task<TEntity> GetByIdAsync(dynamic id)
@@ -328,6 +304,7 @@ namespace Yi.Framework.SqlSugarCore.Repositories
         }
 
 
+
         public virtual async Task<TEntity> GetFirstAsync(Expression<Func<TEntity, bool>> whereExpression)
         {
             return await (await GetDbSimpleClientAsync()).GetFirstAsync(whereExpression);
@@ -343,19 +320,14 @@ namespace Yi.Framework.SqlSugarCore.Repositories
             return await (await GetDbSimpleClientAsync()).GetListAsync(whereExpression);
         }
 
-        public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression,
-            int pageNum, int pageSize)
+        public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize)
         {
-            return await (await GetDbSimpleClientAsync()).GetPageListAsync(whereExpression,
-                new PageModel() { PageIndex = pageNum, PageSize = pageSize });
+            return await (await AsQueryable()).Where(whereExpression).ToPageListAsync(pageNum, pageSize);
         }
 
-        public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression,
-            int pageNum, int pageSize, Expression<Func<TEntity, object>>? orderByExpression = null,
-            OrderByType orderByType = OrderByType.Asc)
+        public virtual async Task<List<TEntity>> GetPageListAsync(Expression<Func<TEntity, bool>> whereExpression, int pageNum, int pageSize, Expression<Func<TEntity, object>>? orderByExpression = null, OrderByType orderByType = OrderByType.Asc)
         {
-            return await (await GetDbSimpleClientAsync()).GetPageListAsync(whereExpression,
-                new PageModel { PageIndex = pageNum, PageSize = pageSize }, orderByExpression, orderByType);
+            return await (await AsQueryable()).Where(whereExpression) .OrderBy( orderByExpression,orderByType).ToPageListAsync(pageNum, pageSize);
         }
 
         public virtual async Task<TEntity> GetSingleAsync(Expression<Func<TEntity, bool>> whereExpression)
@@ -410,9 +382,9 @@ namespace Yi.Framework.SqlSugarCore.Repositories
 
         public virtual async Task<bool> UpdateAsync(TEntity updateObj)
         {
-            if (typeof(TEntity).IsAssignableTo<IHasConcurrencyStamp>()) //带版本号乐观锁更新
+            if (Options is not null && Options.EnabledConcurrencyException)
             {
-                if (Options is not null && Options.EnabledConcurrencyException)
+                if (typeof(TEntity).IsAssignableTo<IHasConcurrencyStamp>()) //带版本号乐观锁更新
                 {
                     try
                     {
@@ -426,24 +398,18 @@ namespace Yi.Framework.SqlSugarCore.Repositories
                             $"{ex.Message}[更新失败：ConcurrencyStamp不是最新版本],entityInfo：{updateObj}", ex);
                     }
                 }
-                else
-                {
-                    int num = await (await GetDbSimpleClientAsync())
-                        .Context.Updateable(updateObj).ExecuteCommandAsync();
-                    return num > 0;
-                }
             }
 
             return await (await GetDbSimpleClientAsync()).UpdateAsync(updateObj);
         }
 
-        public virtual async Task<bool> UpdateAsync(Expression<Func<TEntity, TEntity>> columns,
-            Expression<Func<TEntity, bool>> whereExpression)
+        public virtual async Task<bool> UpdateAsync(Expression<Func<TEntity, TEntity>> columns, Expression<Func<TEntity, bool>> whereExpression)
         {
             return await (await GetDbSimpleClientAsync()).UpdateAsync(columns, whereExpression);
         }
 
 
+
         public virtual async Task<bool> UpdateRangeAsync(List<TEntity> updateObjs)
         {
             return await (await GetDbSimpleClientAsync()).UpdateRangeAsync(updateObjs);
@@ -452,36 +418,30 @@ namespace Yi.Framework.SqlSugarCore.Repositories
         #endregion
     }
 
-    public class SqlSugarRepository<TEntity, TKey> : SqlSugarRepository<TEntity>, ISqlSugarRepository<TEntity, TKey>,
-        IRepository<TEntity, TKey> where TEntity : class, IEntity<TKey>, new()
+    public class SqlSugarRepository<TEntity, TKey> : SqlSugarRepository<TEntity>, ISqlSugarRepository<TEntity, TKey>, IRepository<TEntity, TKey> where TEntity : class, IEntity<TKey>, new()
     {
-        public SqlSugarRepository(ISugarDbContextProvider<ISqlSugarDbContext> dbContextProvider) : base(
-            dbContextProvider)
+        public SqlSugarRepository(ISugarDbContextProvider<ISqlSugarDbContext> sugarDbContextProvider) : base(sugarDbContextProvider)
         {
         }
 
-        public virtual async Task DeleteAsync(TKey id, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteAsync(TKey id, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await DeleteByIdAsync(id);
         }
 
-        public virtual async Task DeleteManyAsync(IEnumerable<TKey> ids, bool autoSave = false,
-            CancellationToken cancellationToken = default)
+        public virtual async Task DeleteManyAsync(IEnumerable<TKey> ids, bool autoSave = false, CancellationToken cancellationToken = default)
         {
             await DeleteByIdsAsync(ids.Select(x => (object)x).ToArray());
         }
 
-        public virtual async Task<TEntity?> FindAsync(TKey id, bool includeDetails = true,
-            CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity?> FindAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
             return await GetByIdAsync(id);
         }
 
-        public virtual async Task<TEntity> GetAsync(TKey id, bool includeDetails = true,
-            CancellationToken cancellationToken = default)
+        public virtual async Task<TEntity> GetAsync(TKey id, bool includeDetails = true, CancellationToken cancellationToken = default)
         {
             return await GetByIdAsync(id);
         }
     }
-}
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/AiUserRoleMenuDto.cs

@@ -18,19 +18,4 @@ public class AiUserRoleMenuDto:UserRoleMenuDto
     /// VIP到期时间
     /// </summary>
     public DateTime? VipExpireTime { get; set; }
-
-    /// <summary>
-    /// 尊享包总Token数
-    /// </summary>
-    public long PremiumTotalTokens { get; set; }
-
-    /// <summary>
-    /// 尊享包已使用Token数
-    /// </summary>
-    public long PremiumUsedTokens { get; set; }
-
-    /// <summary>
-    /// 尊享包剩余Token数
-    /// </summary>
-    public long PremiumRemainingTokens { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementCacheDto.cs

@@ -0,0 +1,22 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 公告缓存 DTO
+/// </summary>
+public class AnnouncementCacheDto
+{
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public string Version { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 公告日志列表
+    /// </summary>
+    public List<AnnouncementLogDto> Logs { get; set; } = new List<AnnouncementLogDto>();
+    
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    public string? Url { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementLogDto.cs

@@ -0,0 +1,44 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 公告日志 DTO
+/// </summary>
+public class AnnouncementLogDto
+{
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string Title { get; set; } 
+
+    /// <summary>
+    /// 内容列表
+    /// </summary>
+    public List<string> Content { get; set; } = new List<string>();
+    
+    /// <summary>
+    /// 图片url
+    /// </summary>
+    public string? ImageUrl { get; set; }
+    
+    /// <summary>
+    /// 开始时间（系统公告时间、活动开始时间）
+    /// </summary>
+    public DateTime StartTime { get; set; }
+
+    /// <summary>
+    /// 活动结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+    
+    /// <summary>
+    /// 公告类型（系统、活动）
+    /// </summary>
+    public AnnouncementTypeEnum Type{ get; set; }
+    
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    public string? Url { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Announcement/AnnouncementOutput.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+/// <summary>
+/// 公告输出 DTO
+/// </summary>
+public class AnnouncementOutput
+{
+    /// <summary>
+    /// 版本号
+    /// </summary>
+    public string Version { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 公告日志列表
+    /// </summary>
+    public List<AnnouncementLogDto> Logs { get; set; } = new List<AnnouncementLogDto>();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/CardFlip/CardFlipStatusOutput.cs

@@ -0,0 +1,93 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+/// <summary>
+/// 翻牌任务状态输出
+/// </summary>
+public class CardFlipStatusOutput
+{
+    /// <summary>
+    /// 本周总翻牌次数
+    /// </summary>
+    public int TotalFlips { get; set; }
+
+    /// <summary>
+    /// 剩余免费次数
+    /// </summary>
+    public int RemainingFreeFlips { get; set; }
+
+    /// <summary>
+    /// 剩余赠送次数
+    /// </summary>
+    public int RemainingBonusFlips { get; set; }
+
+    /// <summary>
+    /// 剩余邀请解锁次数
+    /// </summary>
+    public int RemainingInviteFlips { get; set; }
+
+    /// <summary>
+    /// 是否可以翻牌
+    /// </summary>
+    public bool CanFlip { get; set; }
+
+    /// <summary>
+    /// 用户的邀请码
+    /// </summary>
+    public string? MyInviteCode { get; set; }
+
+    /// <summary>
+    /// 本周邀请人数
+    /// </summary>
+    public int InvitedCount { get; set; }
+    
+    /// <summary>
+    /// 翻牌记录
+    /// </summary>
+    public List<CardFlipRecord> FlipRecords { get; set; } = new();
+
+    /// <summary>
+    /// 下次可翻牌提示
+    /// </summary>
+    public string? NextFlipTip { get; set; }
+
+    /// <summary>
+    /// 当前用户是否已经填写过邀请码
+    /// </summary>
+    public bool IsFilledInviteCode { get; set; }
+}
+
+/// <summary>
+/// 翻牌记录
+/// </summary>
+public class CardFlipRecord
+{
+    /// <summary>
+    /// 翻牌序号（1-10）
+    /// </summary>
+    public int FlipNumber { get; set; }
+
+    /// <summary>
+    /// 是否已翻
+    /// </summary>
+    public bool IsFlipped { get; set; }
+
+    /// <summary>
+    /// 是否中奖
+    /// </summary>
+    public bool IsWin { get; set; }
+
+    /// <summary>
+    /// 奖励金额（token数）
+    /// </summary>
+    public long? RewardAmount { get; set; }
+
+    /// <summary>
+    /// 翻牌类型描述
+    /// </summary>
+    public string? FlipTypeDesc { get; set; }
+
+    /// <summary>
+    /// 在翻牌顺序中的位置（1-10，表示第几个翻）
+    /// </summary>
+    public int FlipOrderIndex { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/CardFlip/FlipCardInput.cs

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+/// <summary>
+/// 翻牌输入
+/// </summary>
+public class FlipCardInput
+{
+    /// <summary>
+    /// 翻牌序号（1-10）
+    /// </summary>
+    public int FlipNumber { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/CardFlip/FlipCardOutput.cs

@@ -0,0 +1,32 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+/// <summary>
+/// 翻牌输出
+/// </summary>
+public class FlipCardOutput
+{
+    /// <summary>
+    /// 翻牌序号（1-10）
+    /// </summary>
+    public int FlipNumber { get; set; }
+
+    /// <summary>
+    /// 是否中奖
+    /// </summary>
+    public bool IsWin { get; set; }
+
+    /// <summary>
+    /// 奖励金额（token数）
+    /// </summary>
+    public long? RewardAmount { get; set; }
+
+    /// <summary>
+    /// 奖励描述
+    /// </summary>
+    public string? RewardDesc { get; set; }
+
+    /// <summary>
+    /// 剩余可翻次数
+    /// </summary>
+    public int RemainingFlips { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/CardFlip/InviteCodeOutput.cs

@@ -0,0 +1,48 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+/// <summary>
+/// 邀请码信息输出
+/// </summary>
+public class InviteCodeOutput
+{
+    /// <summary>
+    /// 我的邀请码
+    /// </summary>
+    public string? MyInviteCode { get; set; }
+
+    /// <summary>
+    /// 本周邀请人数
+    /// </summary>
+    public int InvitedCount { get; set; }
+
+    /// <summary>
+    /// 是否已被邀请
+    /// </summary>
+    public bool IsInvited { get; set; }
+
+    /// <summary>
+    /// 邀请历史记录
+    /// </summary>
+    public List<InvitationHistoryItem> InvitationHistory { get; set; } = new();
+}
+
+/// <summary>
+/// 邀请历史记录项
+/// </summary>
+public class InvitationHistoryItem
+{
+    /// <summary>
+    /// 被邀请人昵称（脱敏）
+    /// </summary>
+    public string InvitedUserName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 邀请时间
+    /// </summary>
+    public DateTime InvitationTime { get; set; }
+
+    /// <summary>
+    /// 本周所在
+    /// </summary>
+    public string WeekDescription { get; set; } = string.Empty;
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/CardFlip/UseInviteCodeInput.cs

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+/// <summary>
+/// 使用邀请码输入
+/// </summary>
+public class UseInviteCodeInput
+{
+    /// <summary>
+    /// 邀请码
+    /// </summary>
+    public string InviteCode { get; set; } = string.Empty;
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/DailyTask/ClaimTaskRewardInput.cs

@@ -0,0 +1,12 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
+
+/// <summary>
+/// 领取任务奖励输入
+/// </summary>
+public class ClaimTaskRewardInput
+{
+    /// <summary>
+    /// 任务等级（1=1000w任务，2=3000w任务）
+    /// </summary>
+    public int TaskLevel { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/DailyTask/DailyTaskStatusOutput.cs

@@ -0,0 +1,58 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
+
+/// <summary>
+/// 每日任务状态输出
+/// </summary>
+public class DailyTaskStatusOutput
+{
+    /// <summary>
+    /// 今日消耗的尊享包Token数
+    /// </summary>
+    public long TodayConsumedTokens { get; set; }
+
+    /// <summary>
+    /// 任务列表
+    /// </summary>
+    public List<DailyTaskItem> Tasks { get; set; } = new();
+}
+
+/// <summary>
+/// 每日任务项
+/// </summary>
+public class DailyTaskItem
+{
+    /// <summary>
+    /// 任务等级（1=1000w任务，2=3000w任务）
+    /// </summary>
+    public int Level { get; set; }
+
+    /// <summary>
+    /// 任务名称
+    /// </summary>
+    public string Name { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 任务描述
+    /// </summary>
+    public string Description { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 任务要求的Token消耗量
+    /// </summary>
+    public long RequiredTokens { get; set; }
+
+    /// <summary>
+    /// 奖励的Token数量
+    /// </summary>
+    public long RewardTokens { get; set; }
+
+    /// <summary>
+    /// 任务状态：0=未完成，1=可领取，2=已领取
+    /// </summary>
+    public int Status { get; set; }
+
+    /// <summary>
+    /// 任务进度百分比（0-100）
+    /// </summary>
+    public decimal Progress { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelApiTypeOption.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// API类型选项
+/// </summary>
+public class ModelApiTypeOption
+{
+    /// <summary>
+    /// 显示名称
+    /// </summary>
+    public string Label { get; set; }
+
+    /// <summary>
+    /// 枚举值
+    /// </summary>
+    public int Value { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryDto.cs

@@ -0,0 +1,79 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 模型库展示数据
+/// </summary>
+public class ModelLibraryDto
+{
+    /// <summary>
+    /// 模型ID
+    /// </summary>
+    public string ModelId { get; set; }
+
+    /// <summary>
+    /// 模型名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 模型描述
+    /// </summary>
+    public string? Description { get; set; }
+
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型类型名称
+    /// </summary>
+    public string ModelTypeName => ModelType.GetDescription();
+
+    /// <summary>
+    /// 模型支持的API类型
+    /// </summary>
+    public List<ModelApiTypeOutput> ModelApiTypes { get; set; }
+
+    
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    public decimal MultiplierShow { get; set; }
+
+    /// <summary>
+    /// 供应商分组名称
+    /// </summary>
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
+
+    /// <summary>
+    /// 是否为尊享模型（PremiumChat类型）
+    /// </summary>
+    public bool IsPremium { get; set; }
+    
+    /// <summary>
+    /// 排序
+    /// </summary>
+    public int OrderNum { get; set; }
+}
+
+public class ModelApiTypeOutput
+{
+    /// <summary>
+    /// 模型类型
+    /// </summary>
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型类型名称
+    /// </summary>
+    public string ModelApiTypeName => ModelApiType.GetDescription();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelLibraryGetListInput.cs

@@ -0,0 +1,35 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 获取模型库列表查询参数
+/// </summary>
+public class ModelLibraryGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 搜索关键词（搜索模型名称、模型ID）
+    /// </summary>
+    public string? SearchKey { get; set; }
+
+    /// <summary>
+    /// 供应商名称筛选
+    /// </summary>
+    public List<string>? ProviderNames { get; set; }
+
+    /// <summary>
+    /// 模型类型筛选
+    /// </summary>
+    public List<ModelTypeEnum>? ModelTypes { get; set; }
+
+    /// <summary>
+    /// API类型筛选
+    /// </summary>
+    public List<ModelApiTypeEnum>? ModelApiTypes { get; set; }
+
+    /// <summary>
+    /// 是否只显示尊享模型
+    /// </summary>
+    public bool? IsPremiumOnly { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Model/ModelTypeOption.cs

@@ -0,0 +1,17 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+/// <summary>
+/// 模型类型选项
+/// </summary>
+public class ModelTypeOption
+{
+    /// <summary>
+    /// 显示名称
+    /// </summary>
+    public string Label { get; set; }
+
+    /// <summary>
+    /// 枚举值
+    /// </summary>
+    public int Value { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/ModelGetListOutput.cs

@@ -62,4 +62,9 @@ public class ModelGetListOutput
     /// 备注信息
     /// </summary>
     public string? Remark { get; set; }
+
+    /// <summary>
+    /// 是否为尊享包
+    /// </summary>
+    public bool IsPremiumPackage { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Pay/GetGoodsListInput.cs

@@ -0,0 +1,16 @@
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Pay;
+
+/// <summary>
+/// 获取商品列表输入DTO
+/// </summary>
+public class GetGoodsListInput
+{
+    /// <summary>
+    /// 商品类别（可选）
+    /// 如果不传，则返回所有商品
+    /// 如果传了，则只返回指定类别的商品（VIP服务或尊享包）
+    /// </summary>
+    public GoodsCategoryType? GoodsCategoryType { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Pay/GoodsListOutput.cs

@@ -17,28 +17,39 @@ public class GoodsListOutput
     /// </summary>
     public decimal OriginalPrice { get; set; }
 
+    /// <summary>
+    /// 商品参考价格
+    /// </summary>
+    public decimal ReferencePrice { get; set; }
+
     /// <summary>
     /// 商品实际价格（折扣后的价格）
     /// </summary>
     public decimal GoodsPrice { get; set; }
 
-    /// <summary>
-    /// 商品类型
-    /// </summary>
-    public GoodsTypeEnum GoodsType { get; set; }
-
-    /// <summary>
-    /// 商品备注
-    /// </summary>
-    public string Remark { get; set; }
-
     /// <summary>
     /// 折扣金额（仅尊享包）
     /// </summary>
     public decimal? DiscountAmount { get; set; }
 
+    /// <summary>
+    /// 商品类别
+    /// </summary>
+    public string GoodsCategory { get; set; }
+
+    /// <summary>
+    /// 商品备注
+    /// </summary>
+    public string Remark { get; set; }
+
+
     /// <summary>
     /// 折扣说明（仅尊享包）
     /// </summary>
     public string? DiscountDescription { get; set; }
-}
+
+    /// <summary>
+    /// 商品类型
+    /// </summary>
+    public GoodsTypeEnum GoodsType { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Token/TokenCreateInput.cs

@@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
+
+/// <summary>
+/// 创建Token输入
+/// </summary>
+public class TokenCreateInput
+{
+    /// <summary>
+    /// 名称（同一用户不能重复）
+    /// </summary>
+    [Required(ErrorMessage = "名称不能为空")]
+    [StringLength(100, ErrorMessage = "名称长度不能超过100个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 过期时间（空为永不过期）
+    /// </summary>
+    public DateTime? ExpireTime { get; set; }
+
+    /// <summary>
+    /// 尊享包额度限制（空为不限制）
+    /// </summary>
+    public long? PremiumQuotaLimit { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Token/TokenGetListOutputDto.cs

@@ -0,0 +1,47 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
+
+/// <summary>
+/// Token列表输出
+/// </summary>
+public class TokenGetListOutputDto
+{
+    /// <summary>
+    /// Token Id
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    public string Name { get; set; }
+
+    /// <summary>
+    /// Token密钥
+    /// </summary>
+    public string ApiKey { get; set; }
+
+    /// <summary>
+    /// 过期时间（空为永不过期）
+    /// </summary>
+    public DateTime? ExpireTime { get; set; }
+
+    /// <summary>
+    /// 尊享包额度限制（空为不限制）
+    /// </summary>
+    public long? PremiumQuotaLimit { get; set; }
+
+    /// <summary>
+    /// 尊享包已使用额度
+    /// </summary>
+    public long PremiumUsedQuota { get; set; }
+
+    /// <summary>
+    /// 是否禁用
+    /// </summary>
+    public bool IsDisabled { get; set; }
+
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Token/TokenSelectListOutputDto.cs

@@ -0,0 +1,9 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
+
+public class TokenSelectListOutputDto
+{
+    public Guid TokenId { get; set; }
+    public string Name { get; set; }
+    
+    public bool IsDisabled { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/Token/TokenUpdateInput.cs

@@ -0,0 +1,32 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
+
+/// <summary>
+/// 编辑Token输入
+/// </summary>
+public class TokenUpdateInput
+{
+    /// <summary>
+    /// Token Id
+    /// </summary>
+    [Required(ErrorMessage = "Id不能为空")]
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 名称（同一用户不能重复）
+    /// </summary>
+    [Required(ErrorMessage = "名称不能为空")]
+    [StringLength(100, ErrorMessage = "名称长度不能超过100个字符")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 过期时间（空为永不过期）
+    /// </summary>
+    public DateTime? ExpireTime { get; set; }
+
+    /// <summary>
+    /// 尊享包额度限制（空为不限制）
+    /// </summary>
+    public long? PremiumQuotaLimit { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/PremiumTokenUsageDto.cs

@@ -0,0 +1,22 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+/// <summary>
+/// 尊享服务Token用量统计DTO
+/// </summary>
+public class PremiumTokenUsageDto
+{
+    /// <summary>
+    /// 总Token数
+    /// </summary>
+    public long PremiumTotalTokens { get; set; }
+
+    /// <summary>
+    /// 已使用Token数
+    /// </summary>
+    public long PremiumUsedTokens { get; set; }
+
+    /// <summary>
+    /// 剩余Token数
+    /// </summary>
+    public long PremiumRemainingTokens { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/PremiumTokenUsageGetListInput.cs

@@ -0,0 +1,12 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+public class PremiumTokenUsageGetListInput : PagedAllResultRequestDto
+{
+    /// <summary>
+    /// 是否免费
+    /// </summary>
+    public bool? IsFree { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/PremiumTokenUsageGetListOutput.cs

@@ -0,0 +1,57 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.Ddd.Application.Contracts;
+
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+public class PremiumTokenUsageGetListOutput : CreationAuditedEntityDto
+{
+   /// <summary>
+   /// id
+   /// </summary>
+   public Guid Id { get; set; }
+
+   /// <summary>
+   /// 用户ID
+   /// </summary>
+   public Guid UserId { get; set; }
+
+   /// <summary>
+   /// 包名称
+   /// </summary>
+   public string PackageName { get; set; }
+
+   /// <summary>
+   /// 总用量（总token数）
+   /// </summary>
+   public long TotalTokens { get; set; }
+
+   /// <summary>
+   /// 剩余用量（剩余token数）
+   /// </summary>
+   public long RemainingTokens { get; set; }
+
+   /// <summary>
+   /// 已使用token数
+   /// </summary>
+   public long UsedTokens { get; set; }
+
+   /// <summary>
+   /// 到期时间
+   /// </summary>
+   public DateTime? ExpireDateTime { get; set; }
+
+   /// <summary>
+   /// 是否激活
+   /// </summary>
+   public bool IsActive { get; set; }
+
+   /// <summary>
+   /// 购买金额
+   /// </summary>
+   public decimal PurchaseAmount { get; set; }
+
+   /// <summary>
+   /// 备注
+   /// </summary>
+   public string? Remark { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/TokenPremiumUsageDto.cs

@@ -0,0 +1,27 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+/// <summary>
+/// 尊享包不同Token用量占比DTO（饼图）
+/// </summary>
+public class TokenPremiumUsageDto
+{
+    /// <summary>
+    /// Token Id
+    /// </summary>
+    public Guid TokenId { get; set; }
+
+    /// <summary>
+    /// Token名称
+    /// </summary>
+    public string TokenName { get; set; }
+
+    /// <summary>
+    /// Token消耗量
+    /// </summary>
+    public long Tokens { get; set; }
+
+    /// <summary>
+    /// 占比（百分比）
+    /// </summary>
+    public decimal Percentage { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/Dtos/UsageStatistics/UsageStatisticsGetInput.cs

@@ -0,0 +1,9 @@
+namespace Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
+
+public class UsageStatisticsGetInput
+{
+    /// <summary>
+    /// tokenId
+    /// </summary>
+    public Guid? TokenId { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IAnnouncementService.cs

@@ -0,0 +1,15 @@
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 公告服务接口
+/// </summary>
+public interface IAnnouncementService
+{
+    /// <summary>
+    /// 获取公告信息
+    /// </summary>
+    /// <returns>公告信息</returns>
+    Task<List<AnnouncementLogDto>> GetAsync();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/ICardFlipService.cs

@@ -0,0 +1,41 @@
+using Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 翻牌服务接口
+/// </summary>
+public interface ICardFlipService
+{
+    /// <summary>
+    /// 获取本周翻牌任务状态
+    /// </summary>
+    /// <returns></returns>
+    Task<CardFlipStatusOutput> GetWeeklyTaskStatusAsync();
+
+    /// <summary>
+    /// 翻牌
+    /// </summary>
+    /// <param name="input">翻牌输入</param>
+    /// <returns></returns>
+    Task<FlipCardOutput> FlipCardAsync(FlipCardInput input);
+
+    /// <summary>
+    /// 使用邀请码解锁翻牌次数
+    /// </summary>
+    /// <param name="input">邀请码输入</param>
+    /// <returns></returns>
+    Task UseInviteCodeAsync(UseInviteCodeInput input);
+
+    /// <summary>
+    /// 获取我的邀请码信息
+    /// </summary>
+    /// <returns></returns>
+    Task<InviteCodeOutput> GetMyInviteCodeAsync();
+
+    /// <summary>
+    /// 生成我的邀请码（如果没有）
+    /// </summary>
+    /// <returns></returns>
+    Task<string> GenerateMyInviteCodeAsync();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IModelService.cs

@@ -0,0 +1,35 @@
+using Volo.Abp.Application.Dtos;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+
+namespace Yi.Framework.AiHub.Application.Contracts.IServices;
+
+/// <summary>
+/// 模型服务接口
+/// </summary>
+public interface IModelService
+{
+    /// <summary>
+    /// 获取模型库列表（公开接口，无需登录）
+    /// </summary>
+    /// <param name="input">查询参数</param>
+    /// <returns>分页模型列表</returns>
+    Task<PagedResultDto<ModelLibraryDto>> GetListAsync(ModelLibraryGetListInput input);
+
+    /// <summary>
+    /// 获取供应商列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>供应商列表</returns>
+    Task<List<string>> GetProviderListAsync();
+
+    /// <summary>
+    /// 获取模型类型选项列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>模型类型选项</returns>
+    Task<List<ModelTypeOption>> GetModelTypeOptionsAsync();
+
+    /// <summary>
+    /// 获取API类型选项列表（公开接口，无需登录）
+    /// </summary>
+    /// <returns>API类型选项</returns>
+    Task<List<ModelApiTypeOption>> GetApiTypeOptionsAsync();
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IPayService.cs

@@ -34,6 +34,7 @@ public interface IPayService : IApplicationService
     /// <summary>
     /// 获取商品列表
     /// </summary>
+    /// <param name="input">获取商品列表输入</param>
     /// <returns>商品列表</returns>
-    Task<List<GoodsListOutput>> GetGoodsListAsync();
+    Task<List<GoodsListOutput>> GetGoodsListAsync([FromQuery] GetGoodsListInput input);
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application.Contracts/IServices/IUsageStatisticsService.cs

@@ -11,11 +11,17 @@ public interface IUsageStatisticsService
     /// 获取当前用户近7天的Token消耗统计
     /// </summary>
     /// <returns>每日Token使用量列表</returns>
-    Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync();
+    Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync(UsageStatisticsGetInput input);
     
     /// <summary>
     /// 获取当前用户各个模型的Token消耗量及占比
     /// </summary>
     /// <returns>模型Token使用量列表</returns>
-    Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync();
+    Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync(UsageStatisticsGetInput input);
+
+    /// <summary>
+    /// 获取当前用户尊享服务Token用量统计
+    /// </summary>
+    /// <returns>尊享服务Token用量统计</returns>
+    Task<PremiumTokenUsageDto> GetPremiumTokenUsageAsync();
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/CardFlipService.cs

@@ -0,0 +1,275 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.CardFlip;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 翻牌服务 - 应用层组合服务
+/// </summary>
+[Authorize]
+public class CardFlipService : ApplicationService, ICardFlipService
+{
+    private readonly CardFlipManager _cardFlipManager;
+    private readonly InviteCodeManager _inviteCodeManager;
+    private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
+    private readonly ILogger<CardFlipService> _logger;
+
+    public CardFlipService(
+        CardFlipManager cardFlipManager,
+        InviteCodeManager inviteCodeManager,
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
+        ILogger<CardFlipService> logger)
+    {
+        _cardFlipManager = cardFlipManager;
+        _inviteCodeManager = inviteCodeManager;
+        _premiumPackageRepository = premiumPackageRepository;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// 获取本周翻牌任务状态
+    /// </summary>
+    public async Task<CardFlipStatusOutput> GetWeeklyTaskStatusAsync()
+    {
+        var userId = CurrentUser.GetId();
+        var weekStart = CardFlipManager.GetWeekStartDate(DateTime.Now);
+
+        // 获取本周任务
+        var task = await _cardFlipManager.GetOrCreateWeeklyTaskAsync(userId, weekStart, createIfNotExists: false);
+
+        // 获取邀请码信息
+        var inviteCode = await _inviteCodeManager.GetUserInviteCodeAsync(userId);
+
+        // 统计本周邀请人数
+        var invitedCount = await _inviteCodeManager.GetWeeklyInvitationCountAsync(userId, weekStart);
+
+        //当前用户是否已填写过邀请码
+        var isFilledInviteCode = await _inviteCodeManager.IsFilledInviteCodeAsync(userId);
+        var output = new CardFlipStatusOutput
+        {
+            TotalFlips = task?.TotalFlips ?? 0,
+            RemainingFreeFlips = CardFlipManager.MAX_FREE_FLIPS - (task?.FreeFlipsUsed ?? 0),
+            RemainingBonusFlips = 0, // 已废弃
+            RemainingInviteFlips = CardFlipManager.MAX_INVITE_FLIPS - (task?.InviteFlipsUsed ?? 0),
+            CanFlip = _cardFlipManager.CanFlipCard(task),
+            MyInviteCode = inviteCode?.Code,
+            InvitedCount = invitedCount,
+            FlipRecords = BuildFlipRecords(task),
+            IsFilledInviteCode = isFilledInviteCode
+        };
+
+        // 生成提示信息
+        output.NextFlipTip = GenerateNextFlipTip(output);
+
+        return output;
+    }
+
+    /// <summary>
+    /// 翻牌
+    /// </summary>
+    public async Task<FlipCardOutput> FlipCardAsync(FlipCardInput input)
+    {
+        var userId = CurrentUser.GetId();
+        var weekStart = CardFlipManager.GetWeekStartDate(DateTime.Now);
+
+        // 执行翻牌逻辑(由Manager处理验证和翻牌)
+        var result = await _cardFlipManager.ExecuteFlipAsync(userId, input.FlipNumber, weekStart);
+
+        // 如果中奖,发放奖励
+        if (result.IsWin)
+        {
+            await GrantRewardAsync(userId, result.RewardAmount, $"翻牌活动-序号{input.FlipNumber}中奖");
+        }
+
+        // 构建输出
+        var output = new FlipCardOutput
+        {
+            FlipNumber = result.FlipNumber,
+            IsWin = result.IsWin,
+            RewardAmount = result.RewardAmount,
+            RewardDesc = result.RewardDesc,
+            RemainingFlips = CardFlipManager.TOTAL_MAX_FLIPS - input.FlipNumber
+        };
+
+        return output;
+    }
+
+    /// <summary>
+    /// 使用邀请码解锁翻牌次数
+    /// </summary>
+    public async Task UseInviteCodeAsync(UseInviteCodeInput input)
+    {
+        var userId = CurrentUser.GetId();
+        var weekStart = CardFlipManager.GetWeekStartDate(DateTime.Now);
+
+        // 获取本周任务
+        var task = await _cardFlipManager.GetOrCreateWeeklyTaskAsync(userId, weekStart, createIfNotExists: true);
+
+        // 验证是否已经使用了所有邀请解锁次数
+        if (task.InviteFlipsUsed >= CardFlipManager.MAX_INVITE_FLIPS)
+        {
+            throw new UserFriendlyException("本周邀请解锁次数已用完");
+        }
+
+        // 使用邀请码(由Manager处理验证和邀请逻辑)
+        await _inviteCodeManager.UseInviteCodeAsync(userId, input.InviteCode);
+
+        _logger.LogInformation($"用户 {userId} 使用邀请码 {input.InviteCode} 解锁翻牌次数成功");
+    }
+
+    /// <summary>
+    /// 获取我的邀请码信息
+    /// </summary>
+    public async Task<InviteCodeOutput> GetMyInviteCodeAsync()
+    {
+        var userId = CurrentUser.GetId();
+        var weekStart = CardFlipManager.GetWeekStartDate(DateTime.Now);
+
+        // 获取我的邀请码
+        var inviteCode = await _inviteCodeManager.GetUserInviteCodeAsync(userId);
+
+        // 统计本周邀请人数
+        var invitedCount = await _inviteCodeManager.GetWeeklyInvitationCountAsync(userId, weekStart);
+
+        // 获取邀请历史
+        var invitationHistory = await _inviteCodeManager.GetInvitationHistoryAsync(userId, 10);
+
+        return new InviteCodeOutput
+        {
+            MyInviteCode = inviteCode?.Code,
+            InvitedCount = invitedCount,
+            InvitationHistory = invitationHistory.Select(x => new InvitationHistoryItem
+            {
+                InvitedUserName = x.InvitedUserName,
+                InvitationTime = x.InvitationTime,
+                WeekDescription = GetWeekDescription(x.InvitationTime)
+            }).ToList()
+        };
+    }
+
+    /// <summary>
+    /// 生成我的邀请码
+    /// </summary>
+    public async Task<string> GenerateMyInviteCodeAsync()
+    {
+        var userId = CurrentUser.GetId();
+
+        // 生成邀请码(由Manager处理)
+        var code = await _inviteCodeManager.GenerateInviteCodeForUserAsync(userId);
+
+        return code;
+    }
+
+    #region 私有辅助方法
+
+    /// <summary>
+    /// 构建翻牌记录列表
+    /// </summary>
+    private List<CardFlipRecord> BuildFlipRecords(CardFlipTaskAggregateRoot? task)
+    {
+        var records = new List<CardFlipRecord>();
+
+        // 获取已翻牌的顺序
+        var flippedOrder = task != null ? _cardFlipManager.GetFlippedOrder(task) : new List<int>();
+        var flippedNumbers = new HashSet<int>(flippedOrder);
+
+        // 获取中奖记录
+        var winRecords = task?.WinRecords ?? new Dictionary<int, long>();
+
+        // 构建记录，按照原始序号1-10排列
+        for (int i = 1; i <= CardFlipManager.TOTAL_MAX_FLIPS; i++)
+        {
+            var record = new CardFlipRecord
+            {
+                FlipNumber = i,
+                IsFlipped = flippedNumbers.Contains(i),
+                IsWin = false,
+                FlipTypeDesc = CardFlipManager.GetFlipTypeDesc(i),
+                // 设置在翻牌顺序中的位置（0表示未翻，>0表示第几个翻的）
+                FlipOrderIndex = flippedOrder.IndexOf(i) >= 0 ? flippedOrder.IndexOf(i) + 1 : 0
+            };
+
+            // 设置中奖信息
+            // 判断这张卡是第几次翻的
+            if (task != null && flippedNumbers.Contains(i))
+            {
+                var flipOrderIndex = flippedOrder.IndexOf(i) + 1; // 第几次翻的（1-based）
+
+                // 检查这次翻牌是否中奖
+                if (winRecords.TryGetValue(flipOrderIndex, out var rewardAmount))
+                {
+                    record.IsWin = true;
+                    record.RewardAmount = rewardAmount;
+                }
+            }
+
+            records.Add(record);
+        }
+
+        return records;
+    }
+
+    /// <summary>
+    /// 生成下次翻牌提示
+    /// </summary>
+    private string GenerateNextFlipTip(CardFlipStatusOutput status)
+    {
+        if (status.TotalFlips >= CardFlipManager.TOTAL_MAX_FLIPS)
+        {
+            return "本周翻牌次数已用完,请下周再来!";
+        }
+
+        if (status.RemainingFreeFlips > 0)
+        {
+            return $"本周您还有{status.RemainingFreeFlips}次免费翻牌机会";
+        }
+        else if (status.RemainingInviteFlips > 0)
+        {
+            if (status.TotalFlips >= 7)
+            {
+                return $"本周使用他人邀请码或他人使用你的邀请码，可解锁{status.RemainingInviteFlips}次翻牌，且必中大奖!每次中奖最大额度将翻倍!";
+            }
+
+            return $"本周使用他人邀请码或他人使用你的邀请码，可解锁{status.RemainingInviteFlips}次翻牌，必中大奖!每次中奖最大额度将翻倍!";
+        }
+
+        return "继续加油!";
+    }
+
+    /// <summary>
+    /// 发放奖励
+    /// </summary>
+    private async Task GrantRewardAsync(Guid userId, long amount, string description)
+    {
+        var premiumPackage = new PremiumPackageAggregateRoot(userId, amount, description)
+        {
+            PurchaseAmount = 0, // 奖励不需要付费
+            Remark = $"翻牌活动奖励:{amount / 10000}w tokens"
+        };
+
+        await _premiumPackageRepository.InsertAsync(premiumPackage);
+
+        _logger.LogInformation($"用户 {userId} 获得翻牌奖励 {amount / 10000}w tokens");
+    }
+
+    /// <summary>
+    /// 获取周描述
+    /// </summary>
+    private string GetWeekDescription(DateTime date)
+    {
+        var weekStart = CardFlipManager.GetWeekStartDate(date);
+        var weekEnd = weekStart.AddDays(6);
+
+        return $"{weekStart:MM-dd} 至 {weekEnd:MM-dd}";
+    }
+
+    #endregion
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Activities/DailyTaskService.cs

@@ -0,0 +1,185 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.DailyTask;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 每日任务服务
+/// </summary>
+[Authorize]
+public class DailyTaskService : ApplicationService
+{
+    private readonly ISqlSugarRepository<DailyTaskRewardRecordAggregateRoot> _dailyTaskRepository;
+    private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
+    private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
+    private readonly ILogger<DailyTaskService> _logger;
+
+    // 任务配置
+    private readonly Dictionary<int, (long RequiredTokens, long RewardTokens, string Name, string Description)>
+        _taskConfigs = new()
+        {
+            { 1, (10000000, 1000000, "尊享包1000w token任务", "累积使用尊享包 1000w token") }, // 1000w消耗 -> 100w奖励
+            { 2, (30000000, 2000000, "尊享包3000w token任务", "累积使用尊享包 3000w token") } // 3000w消耗 -> 200w奖励
+        };
+
+    public DailyTaskService(
+        ISqlSugarRepository<DailyTaskRewardRecordAggregateRoot> dailyTaskRepository,
+        ISqlSugarRepository<MessageAggregateRoot> messageRepository,
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
+        ILogger<DailyTaskService> logger)
+    {
+        _dailyTaskRepository = dailyTaskRepository;
+        _messageRepository = messageRepository;
+        _premiumPackageRepository = premiumPackageRepository;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// 获取今日任务状态
+    /// </summary>
+    /// <returns></returns>
+    public async Task<DailyTaskStatusOutput> GetTodayTaskStatusAsync()
+    {
+        var userId = CurrentUser.GetId();
+        var today = DateTime.Today;
+
+        // 1. 统计今日尊享包Token消耗量
+        var todayConsumed = await GetTodayPremiumTokenConsumptionAsync(userId, today);
+
+        // 2. 查询今日已领取的任务
+        var claimedTasks = await _dailyTaskRepository._DbQueryable
+            .Where(x => x.UserId == userId && x.TaskDate == today)
+            .Select(x => new { x.TaskLevel, x.IsRewarded })
+            .ToListAsync();
+
+        // 3. 构建任务列表
+        var tasks = new List<DailyTaskItem>();
+        foreach (var (level, config) in _taskConfigs)
+        {
+            var claimed = claimedTasks.FirstOrDefault(x => x.TaskLevel == level);
+            int status;
+
+            if (claimed != null && claimed.IsRewarded)
+            {
+                status = 2; // 已领取
+            }
+            else if (todayConsumed >= config.RequiredTokens)
+            {
+                status = 1; // 可领取
+            }
+            else
+            {
+                status = 0; // 未完成
+            }
+
+            var progress = todayConsumed >= config.RequiredTokens
+                ? 100
+                : Math.Round((decimal)todayConsumed / config.RequiredTokens * 100, 2);
+
+            tasks.Add(new DailyTaskItem
+            {
+                Level = level,
+                Name = config.Name,
+                Description = config.Description,
+                RequiredTokens = config.RequiredTokens,
+                RewardTokens = config.RewardTokens,
+                Status = status,
+                Progress = progress
+            });
+        }
+
+        return new DailyTaskStatusOutput
+        {
+            TodayConsumedTokens = todayConsumed,
+            Tasks = tasks
+        };
+    }
+
+    /// <summary>
+    /// 领取任务奖励
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    public async Task ClaimTaskRewardAsync(ClaimTaskRewardInput input)
+    {
+        var userId = CurrentUser.GetId();
+        var today = DateTime.Today;
+
+        // 1. 验证任务等级
+        if (!_taskConfigs.TryGetValue(input.TaskLevel, out var taskConfig))
+        {
+            throw new UserFriendlyException($"无效的任务等级: {input.TaskLevel}");
+        }
+
+        // 2. 检查是否已领取
+        var existingRecord = await _dailyTaskRepository._DbQueryable
+            .Where(x => x.UserId == userId && x.TaskDate == today && x.TaskLevel == input.TaskLevel)
+            .FirstAsync();
+
+        if (existingRecord != null)
+        {
+            throw new UserFriendlyException("今日该任务奖励已领取，请明天再来！");
+        }
+
+        // 3. 验证今日Token消耗是否达标
+        var todayConsumed = await GetTodayPremiumTokenConsumptionAsync(userId, today);
+        if (todayConsumed < taskConfig.RequiredTokens)
+        {
+            throw new UserFriendlyException(
+                $"Token消耗未达标！需要 {taskConfig.RequiredTokens / 10000}w，当前 {todayConsumed / 10000}w");
+        }
+
+        // 4. 创建奖励包（使用 PremiumPackageManager）
+
+        var premiumPackage =
+            new PremiumPackageAggregateRoot(userId, taskConfig.RewardTokens, $"每日任务:{taskConfig.Name}")
+            {
+                PurchaseAmount = 0, // 奖励不需要付费
+                Remark = $"{today:yyyy-MM-dd} 每日任务奖励"
+            };
+
+        await _premiumPackageRepository.InsertAsync(premiumPackage);
+
+        // 5. 记录领取记录
+        var record = new DailyTaskRewardRecordAggregateRoot(userId, input.TaskLevel, today, taskConfig.RewardTokens)
+        {
+            Remark = $"完成任务{input.TaskLevel}，名称：{taskConfig.Name}，消耗 {todayConsumed / 10000}w token"
+        };
+
+        await _dailyTaskRepository.InsertAsync(record);
+
+        _logger.LogInformation(
+            $"用户 {userId} 领取每日任务 {input.TaskLevel} 奖励成功，获得 {taskConfig.RewardTokens / 10000}w tokens");
+    }
+
+    /// <summary>
+    /// 获取今日尊享包Token消耗量
+    /// </summary>
+    /// <param name="userId">用户ID</param>
+    /// <param name="today">今日日期</param>
+    /// <returns>消耗的Token总数</returns>
+    private async Task<long> GetTodayPremiumTokenConsumptionAsync(Guid userId, DateTime today)
+    {
+        var tomorrow = today.AddDays(1);
+
+        // 查询今日所有使用尊享包模型的消息（role=system 表示消耗）
+        var totalTokens = await _messageRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .Where(x => x.Role == "system") // system角色表示实际消耗
+            .Where(x => PremiumPackageConst.ModeIds.Contains(x.ModelId)) // 尊享包模型
+            .Where(x => x.CreationTime >= today && x.CreationTime < tomorrow)
+            .SumAsync(x => x.TokenUsage.TotalTokenCount);
+
+        return totalTokens;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/AiAccountService.cs

@@ -9,7 +9,6 @@ using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.Rbac.Domain.Shared.Dtos;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using Yi.Framework.AiHub.Domain.Extensions;
-using Yi.Framework.AiHub.Domain.Shared.Consts;
 
 namespace Yi.Framework.AiHub.Application.Services;
 
@@ -74,23 +73,79 @@ public class AiAccountService : ApplicationService
             }
         }
 
-        // 获取尊享包Token信息
-        var premiumPackages = await _premiumPackageRepository._DbQueryable
-            .Where(x => x.UserId == userId && x.IsActive)
-            .ToListAsync();
-
-        if (premiumPackages.Any())
-        {
-            // 过滤掉已过期的包
-            var validPackages = premiumPackages
-                .Where(p => p.IsAvailable())
-                .ToList();
-
-            output.PremiumTotalTokens = validPackages.Sum(x => x.TotalTokens);
-            output.PremiumUsedTokens = validPackages.Sum(x => x.UsedTokens);
-            output.PremiumRemainingTokens = validPackages.Sum(x => x.RemainingTokens);
-        }
-
         return output;
     }
+
+    /// <summary>
+    /// 获取利润统计数据
+    /// </summary>
+    /// <param name="currentCost">当前成本(RMB)</param>
+    /// <returns></returns>
+    [Authorize]
+    [HttpGet("account/profit-statistics")]
+    public async Task<string> GetProfitStatisticsAsync([FromQuery] decimal currentCost)
+    {
+        if (CurrentUser.UserName != "Guo" && CurrentUser.UserName != "cc")
+        {
+            throw new UserFriendlyException("您暂无权限访问");
+        }
+
+        // 1. 获取尊享包总消耗和剩余库存
+        var premiumPackages = await _premiumPackageRepository._DbQueryable.ToListAsync();
+        long totalUsedTokens = premiumPackages.Sum(p => p.UsedTokens);
+        long totalRemainingTokens = premiumPackages.Sum(p => p.RemainingTokens);
+
+        // 2. 计算1亿Token成本
+        decimal costPerHundredMillion = totalUsedTokens > 0
+            ? currentCost / (totalUsedTokens / 100000000m)
+            : 0;
+
+        // 3. 计算总成本(剩余+已使用的总成本)
+        long totalTokens = totalUsedTokens + totalRemainingTokens;
+        decimal totalCost = totalTokens > 0
+            ? (totalTokens / 100000000m) * costPerHundredMillion
+            : 0;
+
+        // 4. 获取总收益(RechargeType=PremiumPackage的充值金额总和)
+        decimal totalRevenue = await _rechargeRepository._DbQueryable
+            .Where(x => x.RechargeType == Domain.Shared.Enums.RechargeTypeEnum.PremiumPackage)
+            .SumAsync(x => x.RechargeAmount);
+
+        // 5. 计算利润率
+        decimal profitRate = totalCost > 0
+            ? (totalRevenue / totalCost - 1) * 100
+            : 0;
+
+        // 6. 按200售价计算成本
+        decimal costAt200Price = totalRevenue > 0
+            ? (totalCost / totalRevenue) * 200
+            : 0;
+
+        // 7. 格式化输出
+        var today = DateTime.Now;
+        string dayOfWeek = today.ToString("dddd", new System.Globalization.CultureInfo("zh-CN"));
+        string weekDay = dayOfWeek switch
+        {
+            "星期一" => "周1",
+            "星期二" => "周2",
+            "星期三" => "周3",
+            "星期四" => "周4",
+            "星期五" => "周5",
+            "星期六" => "周6",
+            "星期日" => "周日",
+            _ => dayOfWeek
+        };
+
+        var result = $@"{today:M月d日} {weekDay}
+尊享包已消耗({totalUsedTokens / 100000000m:F2}亿){totalUsedTokens}
+尊享包剩余库存({totalRemainingTokens / 100000000m:F2}亿){totalRemainingTokens}
+当前成本:{currentCost:F2}RMB
+1亿Token成本:{costPerHundredMillion:F2} RMB=1亿 Token
+总成本:{totalCost:F2} RMB
+总收益:{totalRevenue:F2}RMB
+利润率: {profitRate:F1}%
+按200售价来算,成本在{costAt200Price:F2}";
+
+        return result;
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/AnnouncementService.cs

@@ -0,0 +1,68 @@
+using Mapster;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Configuration;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Announcement;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// 公告服务
+/// </summary>
+public class AnnouncementService : ApplicationService, IAnnouncementService
+{
+    private readonly ISqlSugarRepository<AnnouncementAggregateRoot> _announcementRepository;
+    private readonly IConfiguration _configuration;
+    private readonly IDistributedCache<AnnouncementCacheDto> _announcementCache;
+    private const string AnnouncementCacheKey = "AiHub:Announcement";
+
+    public AnnouncementService(
+        ISqlSugarRepository<AnnouncementAggregateRoot> announcementRepository,
+        IConfiguration configuration,
+        IDistributedCache<AnnouncementCacheDto> announcementCache)
+    {
+        _announcementRepository = announcementRepository;
+        _configuration = configuration;
+        _announcementCache = announcementCache;
+    }
+
+    /// <summary>
+    /// 获取公告信息
+    /// </summary>
+    public async Task<List<AnnouncementLogDto>> GetAsync()
+    {
+        // 使用 GetOrAddAsync 从缓存获取或添加数据，缓存1小时
+        var cacheData = await _announcementCache.GetOrAddAsync(
+            AnnouncementCacheKey,
+            async () => await LoadAnnouncementDataAsync(),
+            () => new DistributedCacheEntryOptions
+            {
+                AbsoluteExpirationRelativeToNow = TimeSpan.FromHours(1)
+            }
+        );
+
+        return cacheData?.Logs ?? new List<AnnouncementLogDto>();
+    }
+
+    /// <summary>
+    /// 从数据库加载公告数据
+    /// </summary>
+    private async Task<AnnouncementCacheDto> LoadAnnouncementDataAsync()
+    {
+        // 查询所有公告日志，按日期降序排列
+        var logs = await _announcementRepository._DbQueryable
+            .OrderByDescending(x => x.StartTime)
+            .ToListAsync();
+
+        // 转换为 DTO
+        var logDtos = logs.Adapt<List<AnnouncementLogDto>>();
+        return new AnnouncementCacheDto
+        {
+            Logs = logDtos
+        };
+    }
+}

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

@@ -16,6 +16,7 @@ using Yi.Framework.AiHub.Domain.Entities;
 using Yi.Framework.AiHub.Domain.Entities.Model;
 using Yi.Framework.AiHub.Domain.Extensions;
 using Yi.Framework.AiHub.Domain.Managers;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
@@ -35,17 +36,19 @@ public class AiChatService : ApplicationService
     private readonly AiBlacklistManager _aiBlacklistManager;
     private readonly ILogger<AiChatService> _logger;
     private readonly AiGateWayManager _aiGateWayManager;
+    private readonly PremiumPackageManager _premiumPackageManager;
 
     public AiChatService(IHttpContextAccessor httpContextAccessor,
         AiBlacklistManager aiBlacklistManager,
         ISqlSugarRepository<AiModelEntity> aiModelRepository,
-        ILogger<AiChatService> logger, AiGateWayManager aiGateWayManager)
+        ILogger<AiChatService> logger, AiGateWayManager aiGateWayManager, PremiumPackageManager premiumPackageManager)
     {
         _httpContextAccessor = httpContextAccessor;
         _aiBlacklistManager = aiBlacklistManager;
         _aiModelRepository = aiModelRepository;
         _logger = logger;
         _aiGateWayManager = aiGateWayManager;
+        _premiumPackageManager = premiumPackageManager;
     }
 
 
@@ -70,6 +73,7 @@ public class AiChatService : ApplicationService
     {
         var output = await _aiModelRepository._DbQueryable
             .Where(x => x.ModelType == ModelTypeEnum.Chat)
+            .Where(x => x.ModelApiType == ModelApiTypeEnum.OpenAi)
             .OrderByDescending(x => x.OrderNum)
             .Select(x => new ModelGetListOutput
             {
@@ -84,7 +88,8 @@ public class AiChatService : ApplicationService
                 SystemPrompt = null,
                 ApiHost = null,
                 ApiKey = null,
-                Remark = x.Description
+                Remark = x.Description,
+                IsPremiumPackage = PremiumPackageConst.ModeIds.Contains(x.ModelId)
             }).ToListAsync();
         return output;
     }
@@ -118,9 +123,20 @@ public class AiChatService : ApplicationService
             }
         }
 
+        //如果是尊享包服务，需要校验是是否尊享包足够
+        if (CurrentUser.IsAuthenticated && PremiumPackageConst.ModeIds.Contains(input.Model))
+        {
+            // 检查尊享token包用量
+            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(CurrentUser.GetId());
+            if (availableTokens <= 0)
+            {
+                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+            }
+        }
+
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, sessionId, cancellationToken);
+            CurrentUser.Id, sessionId, null, cancellationToken);
     }
 
 
@@ -154,9 +170,9 @@ public class AiChatService : ApplicationService
         {
             input.Model = "DeepSeek-R1-0528";
         }
-        
+
         //ai网关代理httpcontext
         await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-            CurrentUser.Id, null, cancellationToken);
+            CurrentUser.Id, null, null, cancellationToken);
     }
 }

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

@@ -0,0 +1,118 @@
+using Mapster;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Model;
+using Yi.Framework.AiHub.Application.Contracts.IServices;
+using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services.Chat;
+
+/// <summary>
+/// 模型服务
+/// </summary>
+public class ModelService : ApplicationService, IModelService
+{
+    private readonly ISqlSugarRepository<AiModelEntity, Guid> _modelRepository;
+
+    public ModelService(ISqlSugarRepository<AiModelEntity, Guid> modelRepository)
+    {
+        _modelRepository = modelRepository;
+    }
+
+    /// <summary>
+    /// 获取模型库列表（公开接口，无需登录）
+    /// </summary>
+    public async Task<PagedResultDto<ModelLibraryDto>> GetListAsync(ModelLibraryGetListInput input)
+    {
+        RefAsync<int> total = 0;
+
+        // 查询所有未删除的模型，使用WhereIF动态添加筛选条件
+        var modelIds = (await _modelRepository._DbQueryable
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), x =>
+                x.Name.Contains(input.SearchKey) || x.ModelId.Contains(input.SearchKey))
+            .WhereIF(input.ProviderNames is not null, x =>
+                input.ProviderNames.Contains(x.ProviderName))
+            .WhereIF(input.ModelTypes is not null, x =>
+                input.ModelTypes.Contains(x.ModelType))
+            .WhereIF(input.ModelApiTypes is not null, x =>
+                input.ModelApiTypes.Contains(x.ModelApiType))
+            .WhereIF(input.IsPremiumOnly == true, x =>
+                PremiumPackageConst.ModeIds.Contains(x.ModelId))
+            .GroupBy(x => x.ModelId)
+            .Select(x => x.ModelId)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total));
+
+        var entities = await _modelRepository._DbQueryable.Where(x => modelIds.Contains(x.ModelId))
+            .OrderBy(x => x.OrderNum)
+            .OrderBy(x => x.Name).ToListAsync();
+
+        var output=  entities.GroupBy(x => x.ModelId).Select(x => new ModelLibraryDto
+        {
+            ModelId = x.First().ModelId,
+            Name = x.First().Name,
+            Description = x.First().Description,
+            ModelType = x.First().ModelType,
+            ModelApiTypes = x.Select(y => new ModelApiTypeOutput { ModelApiType = y.ModelApiType }).ToList(),
+            MultiplierShow = x.First().MultiplierShow,
+            ProviderName = x.First().ProviderName,
+            IconUrl = x.First().IconUrl,
+            IsPremium = PremiumPackageConst.ModeIds.Contains(x.First().ModelId),
+            OrderNum = x.First().OrderNum
+        }).ToList();
+        
+        return new PagedResultDto<ModelLibraryDto>(total, output);
+    }
+
+    /// <summary>
+    /// 获取供应商列表（公开接口，无需登录）
+    /// </summary>
+    public async Task<List<string>> GetProviderListAsync()
+    {
+        var providers = await _modelRepository._DbQueryable
+            .Where(x => !x.IsDeleted)
+            .Where(x => !string.IsNullOrEmpty(x.ProviderName))
+            .GroupBy(x => x.ProviderName)
+            .OrderBy(x => x.ProviderName)
+            .Select(x => x.ProviderName)
+            .ToListAsync();
+
+        return providers;
+    }
+
+    /// <summary>
+    /// 获取模型类型选项列表（公开接口，无需登录）
+    /// </summary>
+    public Task<List<ModelTypeOption>> GetModelTypeOptionsAsync()
+    {
+        var options = Enum.GetValues<ModelTypeEnum>()
+            .Select(e => new ModelTypeOption
+            {
+                Label = e.GetDescription(),
+                Value = (int)e
+            })
+            .ToList();
+
+        return Task.FromResult(options);
+    }
+
+    /// <summary>
+    /// 获取API类型选项列表（公开接口，无需登录）
+    /// </summary>
+    public Task<List<ModelApiTypeOption>> GetApiTypeOptionsAsync()
+    {
+        var options = Enum.GetValues<ModelApiTypeEnum>()
+            .Select(e => new ModelApiTypeOption
+            {
+                Label = e.GetDescription(),
+                Value = (int)e
+            })
+            .ToList();
+
+        return Task.FromResult(options);
+    }
+}

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

@@ -0,0 +1,245 @@
+using Dm.util;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using SqlSugar;
+using Volo.Abp.Application.Dtos;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Users;
+using Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.AiHub.Domain.Entities.OpenApi;
+using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.Ddd.Application.Contracts;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Application.Services;
+
+/// <summary>
+/// Token服务
+/// </summary>
+[Authorize]
+public class TokenService : ApplicationService
+{
+    private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
+    private readonly ISqlSugarRepository<UsageStatisticsAggregateRoot> _usageStatisticsRepository;
+
+    public TokenService(
+        ISqlSugarRepository<TokenAggregateRoot> tokenRepository,
+        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository)
+    {
+        _tokenRepository = tokenRepository;
+        _usageStatisticsRepository = usageStatisticsRepository;
+    }
+
+    /// <summary>
+    /// 获取当前用户的Token列表
+    /// </summary>
+    [HttpGet("token/list")]
+    public async Task<PagedResultDto<TokenGetListOutputDto>> GetListAsync([FromQuery] PagedAllResultRequestDto input)
+    {
+        RefAsync<int> total = 0;
+        var userId = CurrentUser.GetId();
+
+        var tokens = await _tokenRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .OrderByDescending(x => x.CreationTime)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+
+        if (!tokens.Any())
+        {
+            return new PagedResultDto<TokenGetListOutputDto>();
+        }
+
+        // 获取尊享包模型ID列表
+        var premiumModelIds = PremiumPackageConst.ModeIds;
+
+        // 批量查询所有Token的尊享包已使用额度
+        var tokenIds = tokens.Select(t => t.Id).ToList();
+        var usageStats = await _usageStatisticsRepository._DbQueryable
+            .Where(x => x.UserId == userId && tokenIds.Contains(x.TokenId) && premiumModelIds.Contains(x.ModelId))
+            .GroupBy(x => x.TokenId)
+            .Select(g => new
+            {
+                TokenId = g.TokenId,
+                UsedQuota = SqlFunc.AggregateSum(g.TotalTokenCount)
+            })
+            .ToListAsync();
+
+        var result = tokens.Select(t =>
+        {
+            var usedQuota = usageStats.FirstOrDefault(u => u.TokenId == t.Id)?.UsedQuota ?? 0;
+            return new TokenGetListOutputDto
+            {
+                Id = t.Id,
+                Name = t.Name,
+                ApiKey = t.Token,
+                ExpireTime = t.ExpireTime,
+                PremiumQuotaLimit = t.PremiumQuotaLimit,
+                PremiumUsedQuota = usedQuota,
+                IsDisabled = t.IsDisabled,
+                CreationTime = t.CreationTime
+            };
+        }).ToList();
+
+        return new PagedResultDto<TokenGetListOutputDto>(total, result);
+    }
+
+    [HttpGet("token/select-list")]
+    public async Task<List<TokenSelectListOutputDto>> GetSelectListAsync()
+    {
+        var userId = CurrentUser.GetId();
+        var tokens = await _tokenRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .OrderBy(x => x.IsDisabled)
+            .OrderByDescending(x => x.CreationTime)
+            .Select(x => new TokenSelectListOutputDto
+            {
+                TokenId = x.Id,
+                Name = x.Name,
+                IsDisabled = x.IsDisabled
+            }).ToListAsync();
+        
+        tokens.Insert(0,new TokenSelectListOutputDto
+        {
+            TokenId = Guid.Empty,
+            Name = "默认",
+            IsDisabled = false
+        });
+        return tokens;
+    }
+
+
+    /// <summary>
+    /// 创建Token
+    /// </summary>
+    [HttpPost("token")]
+    public async Task<TokenGetListOutputDto> CreateAsync([FromBody] TokenCreateInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        // 检查用户是否为VIP
+        if (!CurrentUser.IsAiVip())
+        {
+            throw new UserFriendlyException("充值成为Vip，畅享第三方token服务");
+        }
+
+        // 检查名称是否重复
+        var exists = await _tokenRepository._DbQueryable
+            .AnyAsync(x => x.UserId == userId && x.Name == input.Name);
+        if (exists)
+        {
+            throw new UserFriendlyException($"名称【{input.Name}】已存在，请使用其他名称");
+        }
+
+        var token = new TokenAggregateRoot(userId, input.Name)
+        {
+            ExpireTime = input.ExpireTime,
+            PremiumQuotaLimit = input.PremiumQuotaLimit
+        };
+
+        await _tokenRepository.InsertAsync(token);
+
+        return new TokenGetListOutputDto
+        {
+            Id = token.Id,
+            Name = token.Name,
+            ApiKey = token.Token,
+            ExpireTime = token.ExpireTime,
+            PremiumQuotaLimit = token.PremiumQuotaLimit,
+            PremiumUsedQuota = 0,
+            IsDisabled = token.IsDisabled,
+            CreationTime = token.CreationTime
+        };
+    }
+
+    /// <summary>
+    /// 编辑Token
+    /// </summary>
+    [HttpPut("token")]
+    public async Task UpdateAsync([FromBody] TokenUpdateInput input)
+    {
+        var userId = CurrentUser.GetId();
+
+        var token = await _tokenRepository._DbQueryable
+            .FirstAsync(x => x.Id == input.Id && x.UserId == userId);
+
+        if (token is null)
+        {
+            throw new UserFriendlyException("Token不存在或无权限操作");
+        }
+
+        // 检查名称是否重复（排除自己）
+        var exists = await _tokenRepository._DbQueryable
+            .AnyAsync(x => x.UserId == userId && x.Name == input.Name && x.Id != input.Id);
+        if (exists)
+        {
+            throw new UserFriendlyException($"名称【{input.Name}】已存在，请使用其他名称");
+        }
+
+        token.Name = input.Name;
+        token.ExpireTime = input.ExpireTime;
+        token.PremiumQuotaLimit = input.PremiumQuotaLimit;
+
+        await _tokenRepository.UpdateAsync(token);
+    }
+
+    /// <summary>
+    /// 删除Token
+    /// </summary>
+    [HttpDelete("token/{id}")]
+    public async Task DeleteAsync(Guid id)
+    {
+        var userId = CurrentUser.GetId();
+
+        var token = await _tokenRepository._DbQueryable
+            .FirstAsync(x => x.Id == id && x.UserId == userId);
+
+        if (token is null)
+        {
+            throw new UserFriendlyException("Token不存在或无权限操作");
+        }
+
+        await _tokenRepository.DeleteAsync(token);
+    }
+
+    /// <summary>
+    /// 启用Token
+    /// </summary>
+    [HttpPost("token/{id}/enable")]
+    public async Task EnableAsync(Guid id)
+    {
+        var userId = CurrentUser.GetId();
+
+        var token = await _tokenRepository._DbQueryable
+            .FirstAsync(x => x.Id == id && x.UserId == userId);
+
+        if (token is null)
+        {
+            throw new UserFriendlyException("Token不存在或无权限操作");
+        }
+
+        token.Enable();
+        await _tokenRepository.UpdateAsync(token);
+    }
+
+    /// <summary>
+    /// 禁用Token
+    /// </summary>
+    [HttpPost("token/{id}/disable")]
+    public async Task DisableAsync(Guid id)
+    {
+        var userId = CurrentUser.GetId();
+
+        var token = await _tokenRepository._DbQueryable
+            .FirstAsync(x => x.Id == id && x.UserId == userId);
+
+        if (token is null)
+        {
+            throw new UserFriendlyException("Token不存在或无权限操作");
+        }
+
+        token.Disable();
+        await _tokenRepository.UpdateAsync(token);
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/FileMaster/FileMasterService.cs

@@ -76,12 +76,12 @@ public class FileMasterService : ApplicationService
         if (input.Stream == true)
         {
             await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, cancellationToken);
+                userId, null, null, cancellationToken);
         }
         else
         {
             await _aiGateWayManager.CompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
-                null,
+                null, null,
                 cancellationToken);
         }
     }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/Fuwuhao/FuwuhaoService.cs

@@ -1,5 +1,4 @@
 using System.Text;
-using System.Text.Json;
 using System.Xml.Serialization;
 using Medallion.Threading;
 using Microsoft.AspNetCore.Http;
@@ -18,7 +17,7 @@ using Yi.Framework.Rbac.Application.Contracts.Dtos.Account;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
-namespace Yi.Framework.AiHub.Application.Services;
+namespace Yi.Framework.AiHub.Application.Services.Fuwuhao;
 
 /// <summary>
 /// 服务号服务

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/OpenApiService.cs

@@ -12,6 +12,7 @@ using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Embeddings;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Images;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
 using Yi.Framework.AiHub.Domain.Shared.Enums;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.SqlSugarCore.Abstractions;
@@ -55,22 +56,37 @@ public class OpenApiService : ApplicationService
     {
         //前面都是校验，后面才是真正的调用
         var httpContext = this._httpContextAccessor.HttpContext;
-        var userId = await _tokenManager.GetUserIdAsync(GetTokenByHttpContext(httpContext));
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
+
+        //如果是尊享包服务，需要校验是是否尊享包足够
+        if (PremiumPackageConst.ModeIds.Contains(input.Model))
+        {
+            // 检查尊享token包用量
+            var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
+            if (availableTokens <= 0)
+            {
+                throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+            }
+        }
+
         //ai网关代理httpcontext
         if (input.Stream == true)
         {
             await _aiGateWayManager.CompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, cancellationToken);
+                userId, null, tokenId, cancellationToken);
         }
         else
         {
             await _aiGateWayManager.CompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
-                null,
+                null, tokenId,
                 cancellationToken);
         }
     }
 
+
     /// <summary>
     /// 图片生成
     /// </summary>
@@ -81,11 +97,14 @@ public class OpenApiService : ApplicationService
     {
         var httpContext = this._httpContextAccessor.HttpContext;
         Intercept(httpContext);
-        var userId = await _tokenManager.GetUserIdAsync(GetTokenByHttpContext(httpContext));
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
-        await _aiGateWayManager.CreateImageForStatisticsAsync(httpContext, userId, null, input);
+        await _aiGateWayManager.CreateImageForStatisticsAsync(httpContext, userId, null, input, tokenId);
     }
 
+
     /// <summary>
     /// 向量生成
     /// </summary>
@@ -96,9 +115,11 @@ public class OpenApiService : ApplicationService
     {
         var httpContext = this._httpContextAccessor.HttpContext;
         Intercept(httpContext);
-        var userId = await _tokenManager.GetUserIdAsync(GetTokenByHttpContext(httpContext));
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
-        await _aiGateWayManager.EmbeddingForStatisticsAsync(httpContext, userId, null, input);
+        await _aiGateWayManager.EmbeddingForStatisticsAsync(httpContext, userId, null, input, tokenId);
     }
 
 
@@ -127,7 +148,7 @@ public class OpenApiService : ApplicationService
         };
     }
 
-    
+
     /// <summary>
     /// Anthropic对话（尊享服务专用）
     /// </summary>
@@ -139,7 +160,9 @@ public class OpenApiService : ApplicationService
     {
         //前面都是校验，后面才是真正的调用
         var httpContext = this._httpContextAccessor.HttpContext;
-        var userId = await _tokenManager.GetUserIdAsync(GetTokenByHttpContext(httpContext));
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
         await _aiBlacklistManager.VerifiyAiBlacklist(userId);
 
         // 验证用户是否为VIP
@@ -165,27 +188,87 @@ public class OpenApiService : ApplicationService
         //ai网关代理httpcontext
         if (input.Stream)
         {
-            await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext, input,
-                userId, null, cancellationToken);
+            await _aiGateWayManager.AnthropicCompleteChatStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+                input,
+                userId, null, tokenId, cancellationToken);
         }
         else
         {
-            await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input, userId,
-                null,
+            await _aiGateWayManager.AnthropicCompleteChatForStatisticsAsync(_httpContextAccessor.HttpContext, input,
+                userId,
+                null, tokenId,
                 cancellationToken);
         }
     }
 
+    
+    /// <summary>
+    /// 响应-Openai新规范 (尊享服务专用)
+    /// </summary>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    [HttpPost("openApi/v1/responses")]
+    public async Task ResponsesAsync([FromBody] OpenAiResponsesInput input, CancellationToken cancellationToken)
+    {
+        //前面都是校验，后面才是真正的调用
+        var httpContext = this._httpContextAccessor.HttpContext;
+        var tokenValidation = await _tokenManager.ValidateTokenAsync(GetTokenByHttpContext(httpContext), input.Model);
+        var userId = tokenValidation.UserId;
+        var tokenId = tokenValidation.TokenId;
+        await _aiBlacklistManager.VerifiyAiBlacklist(userId);
 
+        // 验证用户是否为VIP
+        var userInfo = await _accountService.GetAsync(null, null, userId);
+        if (userInfo == null)
+        {
+            throw new UserFriendlyException("用户信息不存在");
+        }
+
+        // 检查是否为VIP（使用RoleCodes判断）
+        if (!userInfo.RoleCodes.Contains(AiHubConst.VipRole) && userInfo.User.UserName != "cc")
+        {
+            throw new UserFriendlyException("该接口为尊享服务专用，需要VIP权限才能使用");
+        }
+
+        // 检查尊享token包用量
+        var availableTokens = await _premiumPackageManager.GetAvailableTokensAsync(userId);
+        if (availableTokens <= 0)
+        {
+            throw new UserFriendlyException("尊享token包用量不足，请先购买尊享token包");
+        }
+
+        //ai网关代理httpcontext
+        if (input.Stream == true)
+        {
+             await _aiGateWayManager.OpenAiResponsesStreamForStatisticsAsync(_httpContextAccessor.HttpContext,
+                 input,
+                 userId, null, tokenId, cancellationToken);
+        }
+        else
+        {
+            await _aiGateWayManager.OpenAiResponsesAsyncForStatisticsAsync(_httpContextAccessor.HttpContext, input,
+                userId,
+                null, tokenId,
+                cancellationToken);
+        }
+    }
+
+    
     #region 私有
 
     private string? GetTokenByHttpContext(HttpContext httpContext)
     {
-        // 获取Authorization头
-        string authHeader = httpContext.Request.Headers["Authorization"];
+        // 优先从 x-api-key 获取
+        string apiKeyHeader = httpContext.Request.Headers["x-api-key"];
+        if (!string.IsNullOrWhiteSpace(apiKeyHeader))
+        {
+            return apiKeyHeader.Trim();
+        }
 
-        // 检查是否有Bearer token
-        if (authHeader != null && authHeader.StartsWith("Bearer "))
+        // 再检查 Authorization 头
+        string authHeader = httpContext.Request.Headers["Authorization"];
+        if (!string.IsNullOrWhiteSpace(authHeader) &&
+            authHeader.StartsWith("Bearer ", StringComparison.OrdinalIgnoreCase))
         {
             return authHeader.Substring("Bearer ".Length).Trim();
         }
@@ -202,5 +285,4 @@ public class OpenApiService : ApplicationService
     }
 
     #endregion
-
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/PayService.cs

@@ -112,6 +112,13 @@ public class PayService : ApplicationService, IPayService
 
             _logger.LogInformation("订单状态更新成功，订单号：{OutTradeNo}，状态：{TradeStatus}", outTradeNo, tradeStatus);
 
+            // 验证交易状态，只有交易成功才执行充值逻辑
+            if (status != TradeStatusEnum.TRADE_SUCCESS)
+            {
+                _logger.LogError($"订单 {outTradeNo} 状态为 {tradeStatus}，不执行充值逻辑");
+                return "success";
+            }
+
             // 5. 根据商品类型进行不同的处理
             if (order.GoodsType.IsPremiumPackage())
             {
@@ -189,9 +196,10 @@ public class PayService : ApplicationService, IPayService
     /// <summary>
     /// 获取商品列表
     /// </summary>
+    /// <param name="input">获取商品列表输入</param>
     /// <returns>商品列表</returns>
     [HttpGet("pay/GoodsList")]
-    public async Task<List<GoodsListOutput>> GetGoodsListAsync()
+    public async Task<List<GoodsListOutput>> GetGoodsListAsync([FromQuery] GetGoodsListInput input)
     {
         var goodsList = new List<GoodsListOutput>();
 
@@ -205,36 +213,56 @@ public class PayService : ApplicationService, IPayService
         // 遍历所有商品枚举
         foreach (GoodsTypeEnum goodsType in Enum.GetValues(typeof(GoodsTypeEnum)))
         {
+            // 如果指定了商品类别，则过滤
+            if (input.GoodsCategoryType.HasValue)
+            {
+                var goodsCategory = goodsType.GetGoodsCategory();
+                if (goodsCategory != input.GoodsCategoryType.Value)
+                {
+                    continue; // 跳过不匹配的商品
+                }
+            }
+
             var originalPrice = goodsType.GetTotalAmount();
             decimal actualPrice = originalPrice;
             decimal? discountAmount = null;
             string? discountDescription = null;
 
             // 如果是尊享包商品，计算折扣
-            if (goodsType.IsPremiumPackage() && CurrentUser.IsAuthenticated)
+            if (goodsType.IsPremiumPackage())
             {
-                discountAmount = goodsType.CalculateDiscount(totalRechargeAmount);
-                actualPrice = goodsType.GetDiscountedPrice(totalRechargeAmount);
 
-                if (discountAmount > 0)
+                
+                if (CurrentUser.IsAuthenticated)
                 {
-                    discountDescription = $"已优惠 ¥{discountAmount:F2}（累计充值每10元减1元，最多减20元）";
+                    discountAmount = goodsType.CalculateDiscount(totalRechargeAmount);
+                    actualPrice = goodsType.GetDiscountedPrice(totalRechargeAmount);
+                    if (discountAmount > 0)
+                    {
+                        discountDescription = $"根据累积充值已优惠 ¥{discountAmount:F2}";
+                    }
+                    else
+                    {
+                        discountDescription = $"累积充值过低，暂无优惠";
+                    }
                 }
                 else
                 {
-                    discountDescription = "累计充值每10元可减1元，最多减20元";
+                    discountDescription = $"登录后查看优惠";
                 }
             }
 
             var goodsItem = new GoodsListOutput
             {
-                GoodsName = goodsType.GetDisplayName(),
+                GoodsName = goodsType.GetChineseName(),
                 OriginalPrice = originalPrice,
+                ReferencePrice = goodsType.GetReferencePrice(),
                 GoodsPrice = actualPrice,
-                GoodsType = goodsType,
-                Remark = GetGoodsRemark(goodsType),
+                GoodsCategory = goodsType.GetGoodsCategory().ToString(),
+                Remark = goodsType.GetRemark(),
                 DiscountAmount = discountAmount,
-                DiscountDescription = discountDescription
+                DiscountDescription = discountDescription,
+                GoodsType = goodsType
             };
 
             goodsList.Add(goodsItem);
@@ -243,27 +271,6 @@ public class PayService : ApplicationService, IPayService
         return goodsList;
     }
 
-    /// <summary>
-    /// 获取商品备注信息
-    /// </summary>
-    /// <param name="goodsType">商品类型</param>
-    /// <returns>商品备注</returns>
-    private string GetGoodsRemark(GoodsTypeEnum goodsType)
-    {
-        if (goodsType.IsPremiumPackage())
-        {
-            var tokenAmount = goodsType.GetTokenAmount();
-            return $"尊享包服务，提供 {tokenAmount:N0} Tokens（需要VIP资格）";
-        }
-        else if (goodsType.IsVipService())
-        {
-            var validMonths = goodsType.GetValidMonths();
-            var monthlyPrice = goodsType.GetMonthlyPrice();
-            return $"VIP服务，有效期 {validMonths} 个月，月均价 ¥{monthlyPrice:F2}";
-        }
-
-        return "未知商品类型";
-    }
 
     /// <summary>
     /// 获取交易状态描述
@@ -288,6 +295,7 @@ public class PayService : ApplicationService, IPayService
         {
             return result;
         }
+
         return TradeStatusEnum.WAIT_TRADE;
     }
-}
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/RechargeService.cs

@@ -8,6 +8,7 @@ using Yi.Framework.AiHub.Application.Contracts.IServices;
 using Yi.Framework.AiHub.Domain.Entities;
 using Yi.Framework.AiHub.Domain.Managers;
 using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 using Yi.Framework.Rbac.Application.Contracts.IServices;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
@@ -64,6 +65,7 @@ namespace Yi.Framework.AiHub.Application.Services
             {
                 // 直接查询该用户最大的过期时间
                 var maxExpireTime = await _repository._DbQueryable
+                    .Where(x => x.RechargeType == RechargeTypeEnum.Vip)
                     .Where(x => x.UserId == input.UserId && x.ExpireDateTime.HasValue)
                     .MaxAsync(x => x.ExpireDateTime);
 
@@ -85,7 +87,8 @@ namespace Yi.Framework.AiHub.Application.Services
                 Content = input.Content,
                 ExpireDateTime = expireDateTime,
                 Remark = input.Remark,
-                ContactInfo = input.ContactInfo
+                ContactInfo = input.ContactInfo,
+                RechargeType = RechargeTypeEnum.Vip
             };
 
             // 保存充值记录到数据库

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/TokenService.cs

@@ -1,55 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Volo.Abp.Application.Services;
-using Volo.Abp.Users;
-using Yi.Framework.AiHub.Application.Contracts.Dtos.Token;
-using Yi.Framework.AiHub.Domain.Entities.OpenApi;
-using Yi.Framework.AiHub.Domain.Extensions;
-using Yi.Framework.AiHub.Domain.Managers;
-using Yi.Framework.SqlSugarCore.Abstractions;
-
-namespace Yi.Framework.AiHub.Application.Services;
-
-public class TokenService : ApplicationService
-{
-    private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
-    private readonly TokenManager _tokenManager;
-
-    /// <summary>
-    /// 构造函数
-    /// </summary>
-    /// <param name="tokenRepository"></param>
-    /// <param name="tokenManager"></param>
-    public TokenService(ISqlSugarRepository<TokenAggregateRoot> tokenRepository, TokenManager tokenManager)
-    {
-        _tokenRepository = tokenRepository;
-        _tokenManager = tokenManager;
-    }
-
-    /// <summary>
-    /// 获取token
-    /// </summary>
-    /// <returns></returns>
-    [Authorize]
-    public async Task<TokenOutput> GetAsync()
-    {
-        return new TokenOutput
-        {
-            ApiKey = await _tokenManager.GetAsync(CurrentUser.GetId())
-        };
-    }
-
-    /// <summary>
-    /// 创建token
-    /// </summary>
-    /// <exception cref="UserFriendlyException"></exception>
-    [Authorize]
-    public async Task CreateAsync()
-    {
-        if (!CurrentUser.IsAiVip())
-        {
-            throw new UserFriendlyException("充值成为Vip，畅享第三方token服务");
-        }
-
-        await _tokenManager.CreateAsync(CurrentUser.GetId());
-    }
-}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Application/Services/UsageStatisticsService.cs

@@ -1,11 +1,18 @@
+using Mapster;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using SqlSugar;
+using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
 using Volo.Abp.Users;
 using Yi.Framework.AiHub.Application.Contracts.Dtos.UsageStatistics;
 using Yi.Framework.AiHub.Application.Contracts.IServices;
 using Yi.Framework.AiHub.Domain.Entities;
 using Yi.Framework.AiHub.Domain.Entities.Chat;
+using Yi.Framework.AiHub.Domain.Entities.OpenApi;
+using Yi.Framework.AiHub.Domain.Extensions;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
+using Yi.Framework.Ddd.Application.Contracts;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.AiHub.Application.Services;
@@ -18,20 +25,26 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
 {
     private readonly ISqlSugarRepository<MessageAggregateRoot> _messageRepository;
     private readonly ISqlSugarRepository<UsageStatisticsAggregateRoot> _usageStatisticsRepository;
+    private readonly ISqlSugarRepository<PremiumPackageAggregateRoot> _premiumPackageRepository;
+    private readonly ISqlSugarRepository<TokenAggregateRoot> _tokenRepository;
 
     public UsageStatisticsService(
         ISqlSugarRepository<MessageAggregateRoot> messageRepository,
-        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository)
+        ISqlSugarRepository<UsageStatisticsAggregateRoot> usageStatisticsRepository,
+        ISqlSugarRepository<PremiumPackageAggregateRoot> premiumPackageRepository,
+        ISqlSugarRepository<TokenAggregateRoot> tokenRepository)
     {
         _messageRepository = messageRepository;
         _usageStatisticsRepository = usageStatisticsRepository;
+        _premiumPackageRepository = premiumPackageRepository;
+        _tokenRepository = tokenRepository;
     }
 
     /// <summary>
     /// 获取当前用户近7天的Token消耗统计
     /// </summary>
     /// <returns>每日Token使用量列表</returns>
-    public async Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync()
+    public async Task<List<DailyTokenUsageDto>> GetLast7DaysTokenUsageAsync([FromQuery]UsageStatisticsGetInput input)
     {
         var userId = CurrentUser.GetId();
         var endDate = DateTime.Today;
@@ -40,7 +53,9 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
         // 从Message表统计近7天的token消耗
         var dailyUsage = await _messageRepository._DbQueryable
             .Where(x => x.UserId == userId)
+            .Where(x => x.Role == "assistant" || x.Role == "system")
             .Where(x => x.CreationTime >= startDate && x.CreationTime < endDate.AddDays(1))
+            .WhereIF(input.TokenId.HasValue,x => x.TokenId == input.TokenId)
             .GroupBy(x => x.CreationTime.Date)
             .Select(g => new
             {
@@ -70,17 +85,19 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
     /// 获取当前用户各个模型的Token消耗量及占比
     /// </summary>
     /// <returns>模型Token使用量列表</returns>
-    public async Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync()
+    public async Task<List<ModelTokenUsageDto>> GetModelTokenUsageAsync([FromQuery]UsageStatisticsGetInput input)
     {
         var userId = CurrentUser.GetId();
 
-        // 从UsageStatistics表获取各模型的token消耗统计
+        // 从UsageStatistics表获取各模型的token消耗统计（按ModelId聚合，因为同一模型可能有多个TokenId的记录）
         var modelUsages = await _usageStatisticsRepository._DbQueryable
             .Where(x => x.UserId == userId)
+            .WhereIF(input.TokenId.HasValue,x => x.TokenId == input.TokenId)
+            .GroupBy(x => x.ModelId)
             .Select(x => new
             {
-                x.ModelId,
-                x.TotalTokenCount
+                ModelId = x.ModelId,
+                TotalTokenCount = SqlFunc.AggregateSum(x.TotalTokenCount)
             })
             .ToListAsync();
 
@@ -102,4 +119,107 @@ public class UsageStatisticsService : ApplicationService, IUsageStatisticsServic
 
         return result;
     }
+
+    /// <summary>
+    /// 获取当前用户尊享服务Token用量统计
+    /// </summary>
+    /// <returns>尊享服务Token用量统计</returns>
+    public async Task<PremiumTokenUsageDto> GetPremiumTokenUsageAsync()
+    {
+        var userId = CurrentUser.GetId();
+
+        // 获取尊享包Token信息
+        var premiumPackages = await _premiumPackageRepository._DbQueryable
+            .Where(x => x.UserId == userId && x.IsActive)
+            .ToListAsync();
+
+        var result = new PremiumTokenUsageDto();
+
+        if (premiumPackages.Any())
+        {
+            // 过滤掉已过期、禁用的包，不过滤用量负数的包
+            var validPackages = premiumPackages
+                .Where(p => p.IsAvailable(false))
+                .ToList();
+
+            result.PremiumTotalTokens = validPackages.Sum(x => x.TotalTokens);
+            result.PremiumUsedTokens = validPackages.Sum(x => x.UsedTokens);
+            result.PremiumRemainingTokens = validPackages.Sum(x => x.RemainingTokens);
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    ///  获取当前用户尊享服务token用量统计列表
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("usage-statistics/premium-token-usage/list")]
+    public async Task<PagedResultDto<PremiumTokenUsageGetListOutput>> GetPremiumTokenUsageListAsync(
+        PremiumTokenUsageGetListInput input)
+    {
+        var userId = CurrentUser.GetId();
+        RefAsync<int> total = 0;
+        // 获取尊享包Token信息
+        var entities = await _premiumPackageRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .WhereIF(input.IsFree == false, x => x.PurchaseAmount > 0)
+            .WhereIF(input.IsFree == true, x => x.PurchaseAmount == 0)
+            .WhereIF(input.StartTime is not null && input.EndTime is not null,
+                x => x.CreationTime >= input.StartTime && x.CreationTime <= input.EndTime)
+            .OrderByDescending(x => x.CreationTime)
+            .ToPageListAsync(input.SkipCount, input.MaxResultCount, total);
+        return new PagedResultDto<PremiumTokenUsageGetListOutput>(total,
+            entities.Adapt<List<PremiumTokenUsageGetListOutput>>());
+    }
+
+    /// <summary>
+    /// 获取当前用户尊享包不同Token用量占比（饼图）
+    /// </summary>
+    /// <returns>各Token的尊享模型用量及占比</returns>
+    [HttpGet("usage-statistics/premium-token-usage/by-token")]
+    public async Task<List<TokenPremiumUsageDto>> GetPremiumTokenUsageByTokenAsync()
+    {
+        var userId = CurrentUser.GetId();
+        var premiumModelIds = PremiumPackageConst.ModeIds;
+
+        // 从UsageStatistics表获取尊享模型的token消耗统计（按TokenId聚合）
+        var tokenUsages = await _usageStatisticsRepository._DbQueryable
+            .Where(x => x.UserId == userId && premiumModelIds.Contains(x.ModelId))
+            .GroupBy(x => x.TokenId)
+            .Select(x => new
+            {
+                TokenId = x.TokenId,
+                TotalTokenCount = SqlFunc.AggregateSum(x.TotalTokenCount)
+            })
+            .ToListAsync();
+
+        if (!tokenUsages.Any())
+        {
+            return new List<TokenPremiumUsageDto>();
+        }
+
+        // 获取用户的所有Token信息用于名称映射
+        var tokenIds = tokenUsages.Select(x => x.TokenId).ToList();
+        var tokens = await _tokenRepository._DbQueryable
+            .Where(x => x.UserId == userId && tokenIds.Contains(x.Id))
+            .Select(x => new { x.Id, x.Name })
+            .ToListAsync();
+
+        var tokenNameDict = tokens.ToDictionary(x => x.Id, x => x.Name);
+
+        // 计算总token数
+        var totalTokens = tokenUsages.Sum(x => x.TotalTokenCount);
+
+        // 计算各Token占比
+        var result = tokenUsages.Select(x => new TokenPremiumUsageDto
+        {
+            TokenId = x.TokenId,
+            TokenName = x.TokenId == Guid.Empty ? "默认" : (tokenNameDict.TryGetValue(x.TokenId, out var name) ? name : "其他"),
+            Tokens = x.TotalTokenCount,
+            Percentage = totalTokens > 0 ? Math.Round((decimal)x.TotalTokenCount / totalTokens * 100, 2) : 0
+        }).OrderByDescending(x => x.Tokens).ToList();
+
+        return result;
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Consts/PremiumPackageConst.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Consts;
+
+public class PremiumPackageConst
+{
+    public static List<string> ModeIds =
+    [
+        "claude-sonnet-4-5-20250929",
+        "claude-haiku-4-5-20251001",
+        "claude-opus-4-5-20251101",
+        "gemini-3-pro-preview",
+        "gpt-5.1-codex-max",
+        "gpt-5.2"
+    ];
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/AiModelDescribe.cs

@@ -56,4 +56,9 @@ public class AiModelDescribe
     /// 模型额外信息
     /// </summary>
     public string? ModelExtraInfo { get; set; }
+    
+    /// <summary>
+    /// 模型倍率
+    /// </summary>
+    public decimal Multiplier { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicChatCompletionDto.cs

@@ -32,6 +32,25 @@ public class AnthropicStreamDto
         PromptTokensDetails = null,
         CompletionTokensDetails = null
     };
+
+
+    public void SupplementalMultiplier(decimal multiplier)
+    {
+        if (this.Usage is not null)
+        {
+            this.Usage.CacheCreationInputTokens =
+                (int)Math.Round((this.Usage.CacheCreationInputTokens ?? 0) * multiplier);
+
+            this.Usage.CacheReadInputTokens =
+                (int)Math.Round((this.Usage.CacheReadInputTokens ?? 0) * multiplier);
+
+            this.Usage.InputTokens =
+                (int)Math.Round((this.Usage.InputTokens ?? 0) * multiplier);
+
+            this.Usage.OutputTokens =
+                (int)Math.Round((this.Usage.OutputTokens ?? 0) * multiplier);
+        }
+    }
 }
 
 public class AnthropicStreamErrorDto
@@ -75,6 +94,8 @@ public class AnthropicChatCompletionDtoContentBlock
     [JsonPropertyName("tool_use_id")] public string? ToolUseId { get; set; }
 
     [JsonPropertyName("content")] public object? Content { get; set; }
+    
+    [JsonPropertyName("text")] public string? Text { get; set; }
 }
 
 public class AnthropicChatCompletionDto
@@ -93,7 +114,7 @@ public class AnthropicChatCompletionDto
 
     public object stop_sequence { get; set; }
 
-    public AnthropicCompletionDtoUsage Usage { get; set; }
+    public AnthropicCompletionDtoUsage? Usage { get; set; }
 
     [JsonIgnore]
     public ThorUsageResponse TokenUsage => new ThorUsageResponse
@@ -108,6 +129,24 @@ public class AnthropicChatCompletionDto
         PromptTokensDetails = null,
         CompletionTokensDetails = null
     };
+    
+    public void SupplementalMultiplier(decimal multiplier)
+    {
+        if (this.Usage is not null)
+        {
+            this.Usage.CacheCreationInputTokens =
+                (int)Math.Round((this.Usage?.CacheCreationInputTokens ?? 0) * multiplier);
+
+            this.Usage.CacheReadInputTokens =
+                (int)Math.Round((this.Usage?.CacheReadInputTokens ?? 0) * multiplier);
+
+            this.Usage.InputTokens =
+                (int)Math.Round((this.Usage?.InputTokens ?? 0) * multiplier);
+
+            this.Usage.OutputTokens =
+                (int)Math.Round((this.Usage?.OutputTokens ?? 0) * multiplier);
+        }
+    }
 }
 
 public class AnthropicChatCompletionDtoContent

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicInput.cs

@@ -108,9 +108,16 @@ public sealed class AnthropicInput
 
 public class AnthropicThinkingInput
 {
-    [JsonPropertyName("type")] public string Type { get; set; }
-
-    [JsonPropertyName("budget_tokens")] public int BudgetTokens { get; set; }
+    [JsonPropertyName("type")] public string? Type { get; set; }
+    [JsonPropertyName("budget_tokens")] public int? BudgetTokens { get; set; }
+    
+    [JsonPropertyName("signature")] public string? Signature { get; set; }
+ 
+    [JsonPropertyName("thinking")] public string? Thinking { get; set; }
+    
+    [JsonPropertyName("data")] public string? Data { get; set; }
+    
+    [JsonPropertyName("text")] public string? Text { get; set; }
 }
 
 public class AnthropicTooChoiceInput
@@ -122,16 +129,16 @@ public class AnthropicTooChoiceInput
 
 public class AnthropicMessageTool
 {
-    [JsonPropertyName("name")] public string name { get; set; }
+    [JsonPropertyName("name")] public string? name { get; set; }
 
     [JsonPropertyName("description")] public string? Description { get; set; }
 
-    [JsonPropertyName("input_schema")] public Input_schema InputSchema { get; set; }
+    [JsonPropertyName("input_schema")] public Input_schema? InputSchema { get; set; }
 }
 
 public class Input_schema
 {
-    [JsonPropertyName("type")] public string Type { get; set; }
+    [JsonPropertyName("type")] public string? Type { get; set; }
 
     [JsonPropertyName("properties")] public Dictionary<string, InputSchemaValue>? Properties { get; set; }
 
@@ -140,9 +147,9 @@ public class Input_schema
 
 public class InputSchemaValue
 {
-    public string type { get; set; }
+    public string? type { get; set; }
 
-    public string description { get; set; }
+    public string? description { get; set; }
 
     public InputSchemaValueItems? items { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicMessageContent.cs

@@ -20,6 +20,8 @@ public class AnthropicMessageContent
 
     [JsonPropertyName("thinking")] public string? Thinking { get; set; }
     
+    [JsonPropertyName("signature")] public string? Signature { get; set; }
+    
     [JsonPropertyName("input")] public object? Input { get; set; }
 
     [JsonPropertyName("content")]

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicMessageInput.cs

@@ -22,11 +22,15 @@ public class AnthropicMessageInput
                 throw new ValidationException("Messages 中 Content 和 Contents 字段不能同时有值");
             }
 
-            if (Content is not null)
+            if (!string.IsNullOrEmpty(Content))
             {
                 return Content;
             }
-
+            // 如果 Contents 为空或 null，返回空字符串而不是 null
+            if (Contents == null || Contents.Count == 0)
+            {
+                return "_"; // 兼容客户端空值问题
+            }
             return Contents!;
         }
         set

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/Anthropic/AnthropicToOpenAI.cs

@@ -1,648 +0,0 @@
-using System.Text.Json;
-using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
-
-namespace Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
-
-public static class AnthropicToOpenAi
-{
-    /// <summary>
-    /// 将AnthropicInput转换为ThorChatCompletionsRequest
-    /// </summary>
-    public static ThorChatCompletionsRequest ConvertAnthropicToOpenAi(AnthropicInput anthropicInput)
-    {
-        var openAiRequest = new ThorChatCompletionsRequest
-        {
-            Model = anthropicInput.Model,
-            MaxTokens = anthropicInput.MaxTokens,
-            Stream = anthropicInput.Stream,
-            Messages = new List<ThorChatMessage>(anthropicInput.Messages.Count)
-        };
-
-        // high medium minimal low
-        if (openAiRequest.Model.EndsWith("-high") ||
-            openAiRequest.Model.EndsWith("-medium") ||
-            openAiRequest.Model.EndsWith("-minimal") ||
-            openAiRequest.Model.EndsWith("-low"))
-        {
-            openAiRequest.ReasoningEffort = openAiRequest.Model switch
-            {
-                var model when model.EndsWith("-high") => "high",
-                var model when model.EndsWith("-medium") => "medium",
-                var model when model.EndsWith("-minimal") => "minimal",
-                var model when model.EndsWith("-low") => "low",
-                _ => "medium"
-            };
-
-            openAiRequest.Model = openAiRequest.Model.Replace("-high", "")
-                .Replace("-medium", "")
-                .Replace("-minimal", "")
-                .Replace("-low", "");
-        }
-
-        if (anthropicInput.Thinking != null &&
-            anthropicInput.Thinking.Type.Equals("enabled", StringComparison.OrdinalIgnoreCase))
-        {
-            openAiRequest.Thinking = new ThorChatClaudeThinking()
-            {
-                BudgetToken = anthropicInput.Thinking.BudgetTokens,
-                Type = "enabled",
-            };
-            openAiRequest.EnableThinking = true;
-        }
-
-        if (openAiRequest.Model.EndsWith("-thinking"))
-        {
-            openAiRequest.EnableThinking = true;
-            openAiRequest.Model = openAiRequest.Model.Replace("-thinking", "");
-        }
-
-        if (openAiRequest.Stream == true)
-        {
-            openAiRequest.StreamOptions = new ThorStreamOptions()
-            {
-                IncludeUsage = true,
-            };
-        }
-
-        if (!string.IsNullOrEmpty(anthropicInput.System))
-        {
-            openAiRequest.Messages.Add(ThorChatMessage.CreateSystemMessage(anthropicInput.System));
-        }
-
-        if (anthropicInput.Systems?.Count > 0)
-        {
-            foreach (var systemContent in anthropicInput.Systems)
-            {
-                openAiRequest.Messages.Add(ThorChatMessage.CreateSystemMessage(systemContent.Text ?? string.Empty));
-            }
-        }
-
-        // 处理messages
-        if (anthropicInput.Messages != null)
-        {
-            foreach (var message in anthropicInput.Messages)
-            {
-                var thorMessages = ConvertAnthropicMessageToThor(message);
-                // 需要过滤 空消息
-                if (thorMessages.Count == 0)
-                {
-                    continue;
-                }
-
-                openAiRequest.Messages.AddRange(thorMessages);
-            }
-
-            openAiRequest.Messages = openAiRequest.Messages
-                .Where(m => !string.IsNullOrEmpty(m.Content) || m.Contents?.Count > 0 || m.ToolCalls?.Count > 0 ||
-                            !string.IsNullOrEmpty(m.ToolCallId))
-                .ToList();
-        }
-
-        // 处理tools
-        if (anthropicInput.Tools is { Count: > 0 })
-        {
-            openAiRequest.Tools = anthropicInput.Tools.Where(x => x.name != "web_search")
-                .Select(ConvertAnthropicToolToThor).ToList();
-        }
-
-        // 判断是否存在web_search
-        if (anthropicInput.Tools?.Any(x => x.name == "web_search") == true)
-        {
-            openAiRequest.WebSearchOptions = new ThorChatWebSearchOptions()
-            {
-            };
-        }
-
-        // 处理tool_choice
-        if (anthropicInput.ToolChoice != null)
-        {
-            openAiRequest.ToolChoice = ConvertAnthropicToolChoiceToThor(anthropicInput.ToolChoice);
-        }
-
-        return openAiRequest;
-    }
-
-    /// <summary>
-    /// 根据最后的内容块类型和OpenAI的完成原因确定Claude的停止原因
-    /// </summary>
-    public static string GetStopReasonByLastContentType(string? openAiFinishReason, string lastContentBlockType)
-    {
-        // 如果最后一个内容块是工具调用，优先返回tool_use
-        if (lastContentBlockType == "tool_use")
-        {
-            return "tool_use";
-        }
-
-        // 否则使用标准的转换逻辑
-        return GetClaudeStopReason(openAiFinishReason);
-    }
-
-    /// <summary>
-    /// 创建message_start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageStartEvent(string messageId, string model)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_start",
-            Message = new AnthropicChatCompletionDto
-            {
-                id = messageId,
-                type = "message",
-                role = "assistant",
-                model = model,
-                content = new AnthropicChatCompletionDtoContent[0],
-                Usage = new AnthropicCompletionDtoUsage
-                {
-                    InputTokens = 0,
-                    OutputTokens = 0,
-                    CacheCreationInputTokens = 0,
-                    CacheReadInputTokens = 0
-                }
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockStartEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "text",
-                Id = null,
-                Name = null
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建thinking block start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateThinkingBlockStartEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "thinking",
-                Id = null,
-                Name = null
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockDeltaEvent(string text)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "text_delta",
-                Text = text
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建thinking delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateThinkingBlockDeltaEvent(string thinking)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "thinking",
-                Thinking = thinking
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建content_block_stop事件
-    /// </summary>
-    public static AnthropicStreamDto CreateContentBlockStopEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_stop",
-            Index = 0
-        };
-    }
-
-    /// <summary>
-    /// 创建message_delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageDeltaEvent(string finishReason, AnthropicCompletionDtoUsage usage)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_delta",
-            Usage = usage,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                StopReason = finishReason
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建message_stop事件
-    /// </summary>
-    public static AnthropicStreamDto CreateMessageStopEvent()
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "message_stop"
-        };
-    }
-
-    /// <summary>
-    /// 创建tool block start事件
-    /// </summary>
-    public static AnthropicStreamDto CreateToolBlockStartEvent(string? toolId, string? toolName)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_start",
-            Index = 0,
-            ContentBlock = new AnthropicChatCompletionDtoContentBlock
-            {
-                Type = "tool_use",
-                Id = toolId,
-                Name = toolName
-            }
-        };
-    }
-
-    /// <summary>
-    /// 创建tool delta事件
-    /// </summary>
-    public static AnthropicStreamDto CreateToolBlockDeltaEvent(string partialJson)
-    {
-        return new AnthropicStreamDto
-        {
-            Type = "content_block_delta",
-            Index = 0,
-            Delta = new AnthropicChatCompletionDtoDelta
-            {
-                Type = "input_json_delta",
-                PartialJson = partialJson
-            }
-        };
-    }
-
-    /// <summary>
-    /// 转换Anthropic消息为Thor消息列表
-    /// </summary>
-    public static List<ThorChatMessage> ConvertAnthropicMessageToThor(AnthropicMessageInput anthropicMessage)
-    {
-        var results = new List<ThorChatMessage>();
-
-        // 处理简单的字符串内容
-        if (anthropicMessage.Content != null)
-        {
-            var thorMessage = new ThorChatMessage
-            {
-                Role = anthropicMessage.Role,
-                Content = anthropicMessage.Content
-            };
-            results.Add(thorMessage);
-            return results;
-        }
-
-        // 处理多模态内容
-        if (anthropicMessage.Contents is { Count: > 0 })
-        {
-            var currentContents = new List<ThorChatMessageContent>();
-            var currentToolCalls = new List<ThorToolCall>();
-
-            foreach (var content in anthropicMessage.Contents)
-            {
-                switch (content.Type)
-                {
-                    case "text":
-                        currentContents.Add(ThorChatMessageContent.CreateTextContent(content.Text ?? string.Empty));
-                        break;
-                    case "thinking" when !string.IsNullOrEmpty(content.Thinking):
-                        results.Add(new ThorChatMessage()
-                        {
-                            ReasoningContent = content.Thinking
-                        });
-                        break;
-                    case "image":
-                    {
-                        if (content.Source != null)
-                        {
-                            var imageUrl = content.Source.Type == "base64"
-                                ? $"data:{content.Source.MediaType};base64,{content.Source.Data}"
-                                : content.Source.Data;
-                            currentContents.Add(ThorChatMessageContent.CreateImageUrlContent(imageUrl ?? string.Empty));
-                        }
-
-                        break;
-                    }
-                    case "tool_use":
-                    {
-                        // 如果有普通内容，先创建内容消息
-                        if (currentContents.Count > 0)
-                        {
-                            if (currentContents.Count == 1 && currentContents.Any(x => x.Type == "text"))
-                            {
-                                var contentMessage = new ThorChatMessage
-                                {
-                                    Role = anthropicMessage.Role,
-                                    ContentCalculated = currentContents.FirstOrDefault()?.Text ?? string.Empty
-                                };
-                                results.Add(contentMessage);
-                            }
-                            else
-                            {
-                                var contentMessage = new ThorChatMessage
-                                {
-                                    Role = anthropicMessage.Role,
-                                    Contents = currentContents
-                                };
-                                results.Add(contentMessage);
-                            }
-
-                            currentContents = new List<ThorChatMessageContent>();
-                        }
-
-                        // 收集工具调用
-                        var toolCall = new ThorToolCall
-                        {
-                            Id = content.Id,
-                            Type = "function",
-                            Function = new ThorChatMessageFunction
-                            {
-                                Name = content.Name,
-                                Arguments = JsonSerializer.Serialize(content.Input)
-                            }
-                        };
-                        currentToolCalls.Add(toolCall);
-                        break;
-                    }
-                    case "tool_result":
-                    {
-                        // 如果有普通内容，先创建内容消息
-                        if (currentContents.Count > 0)
-                        {
-                            var contentMessage = new ThorChatMessage
-                            {
-                                Role = anthropicMessage.Role,
-                                Contents = currentContents
-                            };
-                            results.Add(contentMessage);
-                            currentContents = [];
-                        }
-
-                        // 如果有工具调用，先创建工具调用消息
-                        if (currentToolCalls.Count > 0)
-                        {
-                            var toolCallMessage = new ThorChatMessage
-                            {
-                                Role = anthropicMessage.Role,
-                                ToolCalls = currentToolCalls
-                            };
-                            results.Add(toolCallMessage);
-                            currentToolCalls = new List<ThorToolCall>();
-                        }
-
-                        // 创建工具结果消息
-                        var toolMessage = new ThorChatMessage
-                        {
-                            Role = "tool",
-                            ToolCallId = content.ToolUseId,
-                            Content = content.Content?.ToString() ?? string.Empty
-                        };
-                        results.Add(toolMessage);
-                        break;
-                    }
-                }
-            }
-
-            // 处理剩余的内容
-            if (currentContents.Count > 0)
-            {
-                var contentMessage = new ThorChatMessage
-                {
-                    Role = anthropicMessage.Role,
-                    Contents = currentContents
-                };
-                results.Add(contentMessage);
-            }
-
-            // 处理剩余的工具调用
-            if (currentToolCalls.Count > 0)
-            {
-                var toolCallMessage = new ThorChatMessage
-                {
-                    Role = anthropicMessage.Role,
-                    ToolCalls = currentToolCalls
-                };
-                results.Add(toolCallMessage);
-            }
-        }
-
-        // 如果没有任何内容，返回一个空的消息
-        if (results.Count == 0)
-        {
-            results.Add(new ThorChatMessage
-            {
-                Role = anthropicMessage.Role,
-                Content = string.Empty
-            });
-        }
-
-        // 如果只有一个text则使用content字段
-        if (results is [{ Contents.Count: 1 }] &&
-            results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Type == "text" &&
-            !string.IsNullOrEmpty(results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Text))
-        {
-            return
-            [
-                new ThorChatMessage
-                {
-                    Role = results[0].Role,
-                    Content = results.FirstOrDefault()?.Contents?.FirstOrDefault()?.Text ?? string.Empty
-                }
-            ];
-        }
-
-        return results;
-    }
-
-    /// <summary>
-    /// 转换Anthropic工具为Thor工具
-    /// </summary>
-    public static ThorToolDefinition ConvertAnthropicToolToThor(AnthropicMessageTool anthropicTool)
-    {
-        IDictionary<string, ThorToolFunctionPropertyDefinition> values =
-            new Dictionary<string, ThorToolFunctionPropertyDefinition>();
-
-        if (anthropicTool.InputSchema?.Properties != null)
-        {
-            foreach (var property in anthropicTool.InputSchema.Properties)
-            {
-                if (property.Value?.description != null)
-                {
-                    var definitionType = new ThorToolFunctionPropertyDefinition()
-                    {
-                        Description = property.Value.description,
-                        Type = property.Value.type
-                    };
-                    if (property.Value?.items?.type != null)
-                    {
-                        definitionType.Items = new ThorToolFunctionPropertyDefinition()
-                        {
-                            Type = property.Value.items.type
-                        };
-                    }
-
-                    values.Add(property.Key, definitionType);
-                }
-            }
-        }
-
-
-        return new ThorToolDefinition
-        {
-            Type = "function",
-            Function = new ThorToolFunctionDefinition
-            {
-                Name = anthropicTool.name,
-                Description = anthropicTool.Description,
-                Parameters = new ThorToolFunctionPropertyDefinition
-                {
-                    Type = anthropicTool.InputSchema?.Type ?? "object",
-                    Properties = values,
-                    Required = anthropicTool.InputSchema?.Required
-                }
-            }
-        };
-    }
-
-    /// <summary>
-    /// 将OpenAI的完成原因转换为Claude的停止原因
-    /// </summary>
-    public static string GetClaudeStopReason(string? openAIFinishReason)
-    {
-        return openAIFinishReason switch
-        {
-            "stop" => "end_turn",
-            "length" => "max_tokens",
-            "tool_calls" => "tool_use",
-            "content_filter" => "stop_sequence",
-            _ => "end_turn"
-        };
-    }
-
-    /// <summary>
-    /// 将OpenAI响应转换为Claude响应格式
-    /// </summary>
-    public static AnthropicChatCompletionDto ConvertOpenAIToClaude(ThorChatCompletionsResponse openAIResponse,
-        AnthropicInput originalRequest)
-    {
-        var claudeResponse = new AnthropicChatCompletionDto
-        {
-            id = openAIResponse.Id,
-            type = "message",
-            role = "assistant",
-            model = openAIResponse.Model ?? originalRequest.Model,
-            stop_reason = GetClaudeStopReason(openAIResponse.Choices?.FirstOrDefault()?.FinishReason),
-            stop_sequence = "",
-            content = []
-        };
-
-        if (openAIResponse.Choices is { Count: > 0 })
-        {
-            var choice = openAIResponse.Choices.First();
-            var contents = new List<AnthropicChatCompletionDtoContent>();
-
-            if (!string.IsNullOrEmpty(choice.Message.Content) && !string.IsNullOrEmpty(choice.Message.ReasoningContent))
-            {
-                contents.Add(new AnthropicChatCompletionDtoContent
-                {
-                    type = "thinking",
-                    Thinking = choice.Message.ReasoningContent
-                });
-
-                contents.Add(new AnthropicChatCompletionDtoContent
-                {
-                    type = "text",
-                    text = choice.Message.Content
-                });
-            }
-            else
-            {
-                // 处理思维内容
-                if (!string.IsNullOrEmpty(choice.Message.ReasoningContent))
-                    contents.Add(new AnthropicChatCompletionDtoContent
-                    {
-                        type = "thinking",
-                        Thinking = choice.Message.ReasoningContent
-                    });
-
-                // 处理文本内容
-                if (!string.IsNullOrEmpty(choice.Message.Content))
-                    contents.Add(new AnthropicChatCompletionDtoContent
-                    {
-                        type = "text",
-                        text = choice.Message.Content
-                    });
-            }
-
-            // 处理工具调用
-            if (choice.Message.ToolCalls is { Count: > 0 })
-                contents.AddRange(choice.Message.ToolCalls.Select(toolCall => new AnthropicChatCompletionDtoContent
-                {
-                    type = "tool_use", id = toolCall.Id, name = toolCall.Function?.Name,
-                    input = JsonSerializer.Deserialize<object>(toolCall.Function?.Arguments ?? "{}")
-                }));
-
-            claudeResponse.content = contents.ToArray();
-        }
-
-        // 处理使用情况统计 - 确保始终提供Usage信息
-        claudeResponse.Usage = new AnthropicCompletionDtoUsage
-        {
-            InputTokens = openAIResponse.Usage?.PromptTokens ?? 0,
-            OutputTokens = (int?)(openAIResponse.Usage?.CompletionTokens ?? 0),
-            CacheCreationInputTokens = openAIResponse.Usage?.PromptTokensDetails?.CachedTokens ?? 0,
-            CacheReadInputTokens = openAIResponse.Usage?.PromptTokensDetails?.CachedTokens ?? 0
-        };
-
-        return claudeResponse;
-    }
-
-
-    /// <summary>
-    /// 转换Anthropic工具选择为Thor工具选择
-    /// </summary>
-    public static ThorToolChoice ConvertAnthropicToolChoiceToThor(AnthropicTooChoiceInput anthropicToolChoice)
-    {
-        return new ThorToolChoice
-        {
-            Type = anthropicToolChoice.Type ?? "auto",
-            Function = anthropicToolChoice.Name != null
-                ? new ThorToolChoiceFunctionTool { Name = anthropicToolChoice.Name }
-                : null
-        };
-    }
-}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/Responses/OpenAiResponsesInput.cs

@@ -0,0 +1,47 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+public class OpenAiResponsesInput
+{
+    [JsonPropertyName("stream")] public bool? Stream { get; set; }
+
+    [JsonPropertyName("model")] public string Model { get; set; }
+    [JsonPropertyName("input")] public JsonElement Input { get; set; }
+
+    [JsonPropertyName("max_output_tokens")]
+    public int? MaxOutputTokens { get; set; }
+
+    [JsonPropertyName("max_tool_calls")] public JsonElement? MaxToolCalls { get; set; }
+    [JsonPropertyName("instructions")] public string? Instructions { get; set; }
+    [JsonPropertyName("metadata")] public JsonElement? Metadata { get; set; }
+
+    [JsonPropertyName("parallel_tool_calls")]
+    public bool? ParallelToolCalls { get; set; }
+
+    [JsonPropertyName("previous_response_id")]
+    public string? PreviousResponseId { get; set; }
+
+    [JsonPropertyName("prompt")] public JsonElement? Prompt { get; set; }
+    [JsonPropertyName("prompt_cache_key")] public string? PromptCacheKey { get; set; }
+
+    [JsonPropertyName("prompt_cache_retention")]
+    public string? PromptCacheRetention { get; set; }
+
+    [JsonPropertyName("reasoning")] public JsonElement? Reasoning { get; set; }
+
+    [JsonPropertyName("safety_identifier")]
+    public string? SafetyIdentifier { get; set; }
+
+    [JsonPropertyName("service_tier")] public string? ServiceTier { get; set; }
+    [JsonPropertyName("store")] public bool? Store { get; set; }
+    [JsonPropertyName("stream_options")] public JsonElement? StreamOptions { get; set; }
+    [JsonPropertyName("temperature")] public decimal? Temperature { get; set; }
+    [JsonPropertyName("text")] public JsonElement? Text { get; set; }
+    [JsonPropertyName("tool_choice")] public JsonElement? ToolChoice { get; set; }
+    [JsonPropertyName("tools")] public JsonElement? Tools { get; set; }
+    [JsonPropertyName("top_logprobs")] public int? TopLogprobs { get; set; }
+    [JsonPropertyName("top_p")] public decimal? TopP { get; set; }
+    [JsonPropertyName("truncation")] public string? Truncation { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/Responses/OpenAiResponsesOutput.cs

@@ -0,0 +1,91 @@
+using System.Text.Json.Serialization;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+public class OpenAiResponsesOutput
+{
+    [JsonPropertyName("id")]
+    public string? Id { get; set; }
+    [JsonPropertyName("object")]
+    public string? Object { get; set; }
+    [JsonPropertyName("created_at")]
+    public long CreatedAt { get; set; }
+    [JsonPropertyName("status")]
+    public string? Status { get; set; }
+    [JsonPropertyName("error")]
+    public dynamic? Error { get; set; }
+    [JsonPropertyName("incomplete_details")]
+    public dynamic? IncompleteDetails { get; set; }
+    [JsonPropertyName("instructions")]
+    public dynamic? Instructions { get; set; }
+    [JsonPropertyName("max_output_tokens")]
+    public dynamic? MaxOutputTokens { get; set; }
+    [JsonPropertyName("model")]
+    public string? Model { get; set; }
+    // output 是复杂对象
+    [JsonPropertyName("output")]
+    public List<dynamic>? Output { get; set; }
+    [JsonPropertyName("parallel_tool_calls")]
+    public bool ParallelToolCalls { get; set; }
+    [JsonPropertyName("previous_response_id")]
+    public dynamic? PreviousResponseId { get; set; }
+    [JsonPropertyName("reasoning")]
+    public dynamic? Reasoning { get; set; }
+    [JsonPropertyName("store")]
+    public bool Store { get; set; }
+    [JsonPropertyName("temperature")]
+    public double Temperature { get; set; }
+    [JsonPropertyName("text")]
+    public dynamic? Text { get; set; }
+    [JsonPropertyName("tool_choice")]
+    public string? ToolChoice { get; set; }
+    [JsonPropertyName("tools")]
+    public List<dynamic>? Tools { get; set; }
+    [JsonPropertyName("top_p")]
+    public double TopP { get; set; }
+    [JsonPropertyName("truncation")]
+    public string? Truncation { get; set; }
+    // usage 为唯一强类型
+    [JsonPropertyName("usage")]
+    public OpenAiResponsesUsageOutput? Usage { get; set; }
+    [JsonPropertyName("user")]
+    public dynamic? User { get; set; }
+    [JsonPropertyName("metadata")]
+    public dynamic? Metadata { get; set; }
+    
+    public void SupplementalMultiplier(decimal multiplier)
+    {
+        if (this.Usage is not null)
+        {
+            this.Usage.InputTokens =
+                (int)Math.Round((this.Usage?.InputTokens ?? 0) * multiplier);
+
+            this.Usage.OutputTokens =
+                (int)Math.Round((this.Usage?.OutputTokens ?? 0) * multiplier);
+        }
+    }
+}
+
+public class OpenAiResponsesUsageOutput
+{
+    [JsonPropertyName("input_tokens")]
+    public int InputTokens { get; set; }
+    [JsonPropertyName("input_tokens_details")]
+    public OpenAiResponsesInputTokensDetails? InputTokensDetails { get; set; }
+    [JsonPropertyName("output_tokens")]
+    public int OutputTokens { get; set; }
+    [JsonPropertyName("output_tokens_details")]
+    public OpenAiResponsesOutputTokensDetails? OutputTokensDetails { get; set; }
+    [JsonPropertyName("total_tokens")]
+    public int TotalTokens { get; set; }
+}
+public class OpenAiResponsesInputTokensDetails
+{
+    [JsonPropertyName("cached_tokens")]
+    public int CachedTokens { get; set; }
+}
+public class OpenAiResponsesOutputTokensDetails
+{
+    [JsonPropertyName("reasoning_tokens")]
+    public int ReasoningTokens { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/ThorChatCompletionsResponse.cs

@@ -60,4 +60,22 @@ public record ThorChatCompletionsResponse
     /// </summary>
     [JsonPropertyName("error")]
     public ThorError? Error { get; set; }
+
+    public void SupplementalMultiplier(decimal multiplier)
+    {
+        if (this.Usage is not null)
+        {
+            this.Usage.InputTokens =
+                (int)Math.Round((this.Usage.InputTokens ?? 0) * multiplier);
+            this.Usage.OutputTokens =
+                (int)Math.Round((this.Usage.OutputTokens ?? 0) * multiplier);
+            this.Usage.CompletionTokens =
+                (int)Math.Round((this.Usage.CompletionTokens ?? 0) * multiplier);
+            this.Usage.PromptTokens =
+                (int)Math.Round((this.Usage.PromptTokens ?? 0) * multiplier);
+
+            this.Usage.TotalTokens =
+                (int)Math.Round((this.Usage.TotalTokens ?? 0) * multiplier);
+        }
+    }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Dtos/OpenAi/ThorChatMessage.cs

@@ -90,6 +90,28 @@ public class ThorChatMessage
         }
     }
 
+    
+    /// <summary>
+    /// 用于数据存储
+    /// </summary>
+    [JsonIgnore] 
+    public string MessagesStore
+    {
+        get
+        {
+            if (Content is not null)
+            {
+                return Content;
+            }
+
+            if (Contents is not null && Contents.Any())
+            {
+                return JsonSerializer.Serialize(Contents);
+            }
+            return string.Empty;
+        }
+    }
+    
     /// <summary>
     /// 【可选】参与者的可选名称。提供模型信息以区分相同角色的参与者。
     /// </summary>

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/AnnouncementTypeEnum.cs

@@ -0,0 +1,7 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+public enum AnnouncementTypeEnum
+{
+    Activity=1,
+    System=2
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/GoodsTypeEnum.cs

@@ -10,12 +10,16 @@ namespace Yi.Framework.AiHub.Domain.Shared.Enums;
 public class PriceAttribute : Attribute
 {
     public decimal Price { get; }
+
+    public decimal ReferencePrice { get; }
+
     public int ValidMonths { get; }
 
-    public PriceAttribute(double price, int validMonths)
+    public PriceAttribute(double price, int validMonths, double referencePrice)
     {
         Price = (decimal)price;
         ValidMonths = validMonths;
+        ReferencePrice = (decimal)referencePrice;
     }
 }
 
@@ -26,10 +30,14 @@ public class PriceAttribute : Attribute
 public class DisplayNameAttribute : Attribute
 {
     public string DisplayName { get; }
+    public string ChineseName { get; }
+    public string Remark { get; }
 
-    public DisplayNameAttribute(string displayName)
+    public DisplayNameAttribute(string displayName, string chineseName = "", string remark = "")
     {
         DisplayName = displayName;
+        ChineseName = chineseName;
+        Remark = remark;
     }
 }
 
@@ -56,7 +64,7 @@ public enum GoodsCategoryType
     /// <summary>
     /// VIP服务
     /// </summary>
-    VipService = 1,
+    Vip = 1,
 
     /// <summary>
     /// 尊享包服务
@@ -85,39 +93,27 @@ public class TokenAmountAttribute : Attribute
 public enum GoodsTypeEnum
 {
     // VIP服务
-    [Price(29.9, 1)]
-    [DisplayName("YiXinVip 1 month")]
-    [GoodsCategory(GoodsCategoryType.VipService)]
+    [Price(29.9, 1, 29.9)] [DisplayName("YiXinVip 1 month", "1个月", "灵活选择")] [GoodsCategory(GoodsCategoryType.Vip)]
     YiXinVip1 = 1,
 
-    [Price(83.7, 3)]
-    [DisplayName("YiXinVip 3 month")]
-    [GoodsCategory(GoodsCategoryType.VipService)]
+    [Price(83.7, 3, 27.9)] [DisplayName("YiXinVip 3 month", "3个月", "短期体验")] [GoodsCategory(GoodsCategoryType.Vip)]
     YiXinVip3 = 3,
 
-    [Price(155.4, 6)]
-    [DisplayName("YiXinVip 6 month")]
-    [GoodsCategory(GoodsCategoryType.VipService)]
+    [Price(155.4, 6, 25.9)] [DisplayName("YiXinVip 6 month", "6个月", "年度热销")] [GoodsCategory(GoodsCategoryType.Vip)]
     YiXinVip6 = 6,
 
-    [Price(183.2, 8)]
-    [DisplayName("YiXinVip 8 month")]
-    [GoodsCategory(GoodsCategoryType.VipService)]
-    YiXinVip8 = 8,
-
     // 尊享包服务 - 需要VIP资格才能购买
-    [Price(188.9, 0)]
-    [DisplayName("Premium Package 5000W Tokens")]
+    [Price(188.9, 0, 1750)]
+    [DisplayName("YiXinPremiumPackage 5000W Tokens", "5000万Tokens", "简单尝试")]
     [GoodsCategory(GoodsCategoryType.PremiumPackage)]
-    [TokenAmount(5000)]
+    [TokenAmount(50000000)]
     PremiumPackage5000W = 101,
 
-    [Price(248.9, 0)]
-    [DisplayName("Premium Package 10000W Tokens")]
+    [Price(248.9, 0, 3500)]
+    [DisplayName("YiXinPremiumPackage 10000W Tokens", "1亿Tokens（推荐）", "极致性价比")]
     [GoodsCategory(GoodsCategoryType.PremiumPackage)]
-    [TokenAmount(10000)]
+    [TokenAmount(100000000)]
     PremiumPackage10000W = 102,
-    
 }
 
 public static class GoodsTypeEnumExtensions
@@ -181,6 +177,18 @@ public static class GoodsTypeEnumExtensions
         return validMonths > 0 ? totalPrice / validMonths : 0m;
     }
 
+    /// <summary>
+    /// 获取商品参考价格
+    /// </summary>
+    /// <param name="goodsType">商品类型</param>
+    /// <returns>参考价格</returns>
+    public static decimal GetReferencePrice(this GoodsTypeEnum goodsType)
+    {
+        var fieldInfo = goodsType.GetType().GetField(goodsType.ToString());
+        var priceAttribute = fieldInfo?.GetCustomAttribute<PriceAttribute>();
+        return priceAttribute?.ReferencePrice ?? 0m;
+    }
+
     /// <summary>
     /// 获取商品类别
     /// </summary>
@@ -190,7 +198,7 @@ public static class GoodsTypeEnumExtensions
     {
         var fieldInfo = goodsType.GetType().GetField(goodsType.ToString());
         var categoryAttribute = fieldInfo?.GetCustomAttribute<GoodsCategoryAttribute>();
-        return categoryAttribute?.Category ?? GoodsCategoryType.VipService;
+        return categoryAttribute?.Category ?? GoodsCategoryType.Vip;
     }
 
     /// <summary>
@@ -210,7 +218,7 @@ public static class GoodsTypeEnumExtensions
     /// <returns>是否为VIP服务</returns>
     public static bool IsVipService(this GoodsTypeEnum goodsType)
     {
-        return goodsType.GetGoodsCategory() == GoodsCategoryType.VipService;
+        return goodsType.GetGoodsCategory() == GoodsCategoryType.Vip;
     }
 
     /// <summary>
@@ -225,9 +233,33 @@ public static class GoodsTypeEnumExtensions
         return tokenAttribute?.TokenAmount ?? 0;
     }
 
+    /// <summary>
+    /// 获取商品中文名称
+    /// </summary>
+    /// <param name="goodsType">商品类型</param>
+    /// <returns>中文名称</returns>
+    public static string GetChineseName(this GoodsTypeEnum goodsType)
+    {
+        var fieldInfo = goodsType.GetType().GetField(goodsType.ToString());
+        var displayNameAttribute = fieldInfo?.GetCustomAttribute<DisplayNameAttribute>();
+        return displayNameAttribute?.ChineseName ?? goodsType.ToString();
+    }
+
+    /// <summary>
+    /// 获取商品备注
+    /// </summary>
+    /// <param name="goodsType">商品类型</param>
+    /// <returns>备注信息</returns>
+    public static string GetRemark(this GoodsTypeEnum goodsType)
+    {
+        var fieldInfo = goodsType.GetType().GetField(goodsType.ToString());
+        var displayNameAttribute = fieldInfo?.GetCustomAttribute<DisplayNameAttribute>();
+        return displayNameAttribute?.Remark ?? string.Empty;
+    }
+
     /// <summary>
     /// 计算折扣金额（仅用于尊享包）
-    /// 规则：每累加充值10元，减少1元，最多减少20元
+    /// 规则：每累加充值10元，减少10元，最多减少50元
     /// </summary>
     /// <param name="goodsType">商品类型</param>
     /// <param name="totalRechargeAmount">用户累加充值金额</param>
@@ -239,12 +271,11 @@ public static class GoodsTypeEnumExtensions
         {
             return 0m;
         }
-
-        // 每10元减1元
-        var discountAmount = Math.Floor(totalRechargeAmount / 10m);
-
-        // 最多减少20元
-        return Math.Min(discountAmount, 20m);
+        // 每满 10 元减 10 元
+        var discountTimes = Math.Floor(totalRechargeAmount / 10m);
+        var discountAmount = discountTimes * 10m;
+        // 最多减少 50 元
+        return Math.Min(discountAmount, 50m);
     }
 
     /// <summary>
@@ -260,6 +291,6 @@ public static class GoodsTypeEnumExtensions
         var discountedPrice = originalPrice - discount;
 
         // 确保价格不为负数，至少为0.01元
-        return Math.Max(discountedPrice, 0.01m);
+        return Math.Round(discountedPrice, 2);
     }
-}
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/ModelApiTypeEnum.cs

@@ -0,0 +1,15 @@
+using System.ComponentModel;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+public enum ModelApiTypeEnum
+{
+    [Description("OpenAI")]
+    OpenAi,
+
+    [Description("Claude")]
+    Claude,
+    
+    [Description("Response")]
+    Response
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/ModelTypeEnum.cs

@@ -1,9 +1,15 @@
-namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+using System.ComponentModel;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
 
 public enum ModelTypeEnum
 {
+    [Description("聊天")]
     Chat = 0,
+
+    [Description("图片")]
     Image = 1,
-    Embedding = 2,
-    PremiumChat = 3
+
+    [Description("嵌入")]
+    Embedding = 2
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Enums/RechargeTypeEnum.cs

@@ -0,0 +1,7 @@
+namespace Yi.Framework.AiHub.Domain.Shared.Enums;
+
+public enum RechargeTypeEnum
+{
+    Vip = 10,
+    PremiumPackage = 20
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Extensions/EnumExtensions.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel;
+using System.Reflection;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+/// <summary>
+/// 枚举扩展方法
+/// </summary>
+public static class EnumExtensions
+{
+    /// <summary>
+    /// 获取枚举的Description特性值
+    /// </summary>
+    /// <param name="value">枚举值</param>
+    /// <returns>Description特性值，如果没有则返回枚举名称</returns>
+    public static string GetDescription(this Enum value)
+    {
+        var field = value.GetType().GetField(value.ToString());
+        if (field == null)
+        {
+            return value.ToString();
+        }
+
+        var attribute = field.GetCustomAttribute<DescriptionAttribute>();
+        return attribute?.Description ?? value.ToString();
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain.Shared/Extensions/JsonElementExtensions.cs

@@ -0,0 +1,279 @@
+using System.Text.Json;
+
+namespace Yi.Framework.AiHub.Domain.Shared.Extensions;
+
+public static class JsonElementExtensions
+{
+    #region 路径访问
+
+    /// <summary>
+    /// 链式获取深层属性，支持对象属性和数组索引
+    /// </summary>
+    /// <example>
+    /// root.GetPath("user", "addresses", 0, "city")
+    /// </example>
+    public static JsonElement? GetPath(this JsonElement element, params object[] path)
+    {
+        JsonElement current = element;
+
+        foreach (var key in path)
+        {
+            switch (key)
+            {
+                case string propertyName:
+                    if (current.ValueKind != JsonValueKind.Object ||
+                        !current.TryGetProperty(propertyName, out current))
+                        return null;
+                    break;
+
+                case int index:
+                    if (current.ValueKind != JsonValueKind.Array ||
+                        index < 0 || index >= current.GetArrayLength())
+                        return null;
+                    current = current[index];
+                    break;
+
+                default:
+                    return null;
+            }
+        }
+
+        return current;
+    }
+
+    /// <summary>
+    /// 安全获取对象属性
+    /// </summary>
+    public static JsonElement? Get(this JsonElement element, string propertyName)
+    {
+        if (element.ValueKind == JsonValueKind.Object &&
+            element.TryGetProperty(propertyName, out var value))
+            return value;
+        return null;
+    }
+
+    /// <summary>
+    /// 安全获取数组元素
+    /// </summary>
+    public static JsonElement? Get(this JsonElement element, int index)
+    {
+        if (element.ValueKind == JsonValueKind.Array &&
+            index >= 0 && index < element.GetArrayLength())
+            return element[index];
+        return null;
+    }
+
+    /// <summary>
+    /// 链式安全获取对象属性
+    /// </summary>
+    public static JsonElement? Get(this JsonElement? element, string propertyName)
+        => element?.Get(propertyName);
+
+    /// <summary>
+    /// 链式安全获取数组元素
+    /// </summary>
+    public static JsonElement? Get(this JsonElement? element, int index)
+        => element?.Get(index);
+
+    #endregion
+
+    #region 取值方法（带默认值）
+
+    public static string? GetString(this JsonElement? element, string? defaultValue = null)
+        => element?.ValueKind == JsonValueKind.String ? element.Value.GetString() : defaultValue;
+
+    public static int GetInt(this JsonElement? element, int defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt32() : defaultValue;
+
+    public static long GetLong(this JsonElement? element, long defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt64() : defaultValue;
+
+    public static double GetDouble(this JsonElement? element, double defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDouble() : defaultValue;
+
+    public static decimal GetDecimal(this JsonElement? element, decimal defaultValue = 0)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDecimal() : defaultValue;
+
+    public static bool GetBool(this JsonElement? element, bool defaultValue = false)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? element.Value.GetBoolean()
+            : defaultValue;
+
+    public static DateTime GetDateTime(this JsonElement? element, DateTime defaultValue = default)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetDateTime(out var dt)
+            ? dt
+            : defaultValue;
+
+    public static Guid GetGuid(this JsonElement? element, Guid defaultValue = default)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetGuid(out var guid)
+            ? guid
+            : defaultValue;
+
+    #endregion
+
+    #region 可空取值方法
+
+    public static int? GetIntOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt32() : null;
+
+    public static long? GetLongOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetInt64() : null;
+
+    public static double? GetDoubleOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDouble() : null;
+
+    public static decimal? GetDecimalOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number ? element.Value.GetDecimal() : null;
+
+    public static bool? GetBoolOrNull(this JsonElement? element)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False
+            ? element.Value.GetBoolean()
+            : null;
+
+    public static DateTime? GetDateTimeOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetDateTime(out var dt)
+            ? dt
+            : null;
+
+    public static Guid? GetGuidOrNull(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String && element.Value.TryGetGuid(out var guid)
+            ? guid
+            : null;
+
+    #endregion
+
+    #region 数组操作
+
+    /// <summary>
+    /// 安全获取数组，不存在返回空数组
+    /// </summary>
+    public static IEnumerable<JsonElement> GetArray(this JsonElement? element)
+    {
+        if (element?.ValueKind == JsonValueKind.Array)
+        {
+            foreach (var item in element.Value.EnumerateArray())
+                yield return item;
+        }
+    }
+
+    /// <summary>
+    /// 获取数组长度
+    /// </summary>
+    public static int GetArrayLength(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Array ? element.Value.GetArrayLength() : 0;
+
+    /// <summary>
+    /// 数组转 List
+    /// </summary>
+    public static List<string?> ToStringList(this JsonElement? element)
+        => element.GetArray().Select(e => e.GetString()).ToList();
+
+    public static List<int> ToIntList(this JsonElement? element)
+        => element.GetArray()
+            .Where(e => e.ValueKind == JsonValueKind.Number)
+            .Select(e => e.GetInt32())
+            .ToList();
+
+    #endregion
+
+    #region 对象操作
+
+    /// <summary>
+    /// 安全枚举对象属性
+    /// </summary>
+    public static IEnumerable<JsonProperty> GetProperties(this JsonElement? element)
+    {
+        if (element?.ValueKind == JsonValueKind.Object)
+        {
+            foreach (var prop in element.Value.EnumerateObject())
+                yield return prop;
+        }
+    }
+
+    /// <summary>
+    /// 获取所有属性名
+    /// </summary>
+    public static IEnumerable<string> GetPropertyNames(this JsonElement? element)
+        => element.GetProperties().Select(p => p.Name);
+
+    /// <summary>
+    /// 判断是否包含某属性
+    /// </summary>
+    public static bool HasProperty(this JsonElement? element, string propertyName)
+        => element?.ValueKind == JsonValueKind.Object &&
+           element.Value.TryGetProperty(propertyName, out _);
+
+    #endregion
+
+    #region 类型判断
+
+    public static bool IsNull(this JsonElement? element)
+        => element == null || element.Value.ValueKind == JsonValueKind.Null;
+
+    public static bool IsNullOrUndefined(this JsonElement? element)
+        => element == null || element.Value.ValueKind is JsonValueKind.Null or JsonValueKind.Undefined;
+
+    public static bool IsObject(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Object;
+
+    public static bool IsArray(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Array;
+
+    public static bool IsString(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.String;
+
+    public static bool IsNumber(this JsonElement? element)
+        => element?.ValueKind == JsonValueKind.Number;
+
+    public static bool IsBool(this JsonElement? element)
+        => element?.ValueKind is JsonValueKind.True or JsonValueKind.False;
+
+    public static bool Exists(this JsonElement? element)
+        => element != null && element.Value.ValueKind != JsonValueKind.Undefined;
+
+    #endregion
+
+    #region 反序列化
+
+    /// <summary>
+    /// 反序列化为指定类型
+    /// </summary>
+    public static T? Deserialize<T>(this JsonElement? element, JsonSerializerOptions? options = null)
+        => element.HasValue ? element.Value.Deserialize<T>(options) : default;
+
+    /// <summary>
+    /// 反序列化为指定类型，带默认值
+    /// </summary>
+    public static T Deserialize<T>(this JsonElement? element, T defaultValue, JsonSerializerOptions? options = null)
+        => element.HasValue ? element.Value.Deserialize<T>(options) ?? defaultValue : defaultValue;
+
+    #endregion
+
+    #region 转换为字典/动态类型
+
+    /// <summary>
+    /// 转换为 Dictionary
+    /// </summary>
+    public static Dictionary<string, JsonElement>? ToDictionary(this JsonElement? element)
+    {
+        if (element?.ValueKind != JsonValueKind.Object)
+            return null;
+
+        var dict = new Dictionary<string, JsonElement>();
+        foreach (var prop in element.Value.EnumerateObject())
+            dict[prop.Name] = prop.Value;
+        return dict;
+    }
+
+    #endregion
+
+    #region 原始值
+
+    /// <summary>
+    /// 获取原始 JSON 字符串
+    /// </summary>
+    public static string? GetRawText(this JsonElement? element)
+        => element?.GetRawText();
+
+    #endregion
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/IOpenAiResponseService.cs

@@ -0,0 +1,30 @@
+using System.Text.Json;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay;
+
+public interface IOpenAiResponseService
+{
+    /// <summary>
+    /// 响应-流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public IAsyncEnumerable<(string, JsonElement?)> ResponsesStreamAsync(AiModelDescribe aiModelDescribe,
+        OpenAiResponsesInput input,
+        CancellationToken cancellationToken);
+
+    /// <summary>
+    /// 响应-非流式
+    /// </summary>
+    /// <param name="aiModelDescribe"></param>
+    /// <param name="input"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public Task<OpenAiResponsesOutput> ResponsesAsync(AiModelDescribe aiModelDescribe,
+        OpenAiResponsesInput input,
+        CancellationToken cancellationToken);
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorClaude/Chats/AnthropicChatCompletionsService.cs

@@ -9,19 +9,22 @@ using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 
 namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorClaude.Chats;
 
-public class AnthropicChatCompletionsService(IHttpClientFactory httpClientFactory,ILogger<AnthropicChatCompletionsService> logger)
+public class AnthropicChatCompletionsService(
+    IHttpClientFactory httpClientFactory,
+    ILogger<AnthropicChatCompletionsService> logger)
     : IAnthropicChatCompletionService
 {
     public async Task<AnthropicChatCompletionDto> ChatCompletionsAsync(AiModelDescribe options, AnthropicInput input,
         CancellationToken cancellationToken = default)
     {
-          using var openai =
+        using var openai =
             Activity.Current?.Source.StartActivity("Claudia 对话补全");
 
         if (string.IsNullOrEmpty(options.Endpoint))
         {
             options.Endpoint = "https://api.anthropic.com/";
         }
+
         var client = httpClientFactory.CreateClient();
 
         var headers = new Dictionary<string, string>
@@ -71,30 +74,32 @@ public class AnthropicChatCompletionsService(IHttpClientFactory httpClientFactor
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
                 response.StatusCode, error);
 
-            throw new Exception("OpenAI对话异常" + response.StatusCode.ToString());
+            throw new Exception( $"恭喜你运气爆棚遇到了错误，尊享包对话异常：StatusCode【{response.StatusCode}】，Response【{error}】");
         }
-        
+
         var value =
             await response.Content.ReadFromJsonAsync<AnthropicChatCompletionDto>(ThorJsonSerializer.DefaultOptions,
                 cancellationToken: cancellationToken);
-
+        
         return value;
     }
 
-    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> StreamChatCompletionsAsync(AiModelDescribe options, AnthropicInput input,
+    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> StreamChatCompletionsAsync(AiModelDescribe options,
+        AnthropicInput input,
         CancellationToken cancellationToken = default)
     {
-                using var openai =
+        using var openai =
             Activity.Current?.Source.StartActivity("Claudia 对话补全");
 
         if (string.IsNullOrEmpty(options.Endpoint))
         {
             options.Endpoint = "https://api.anthropic.com/";
         }
-        
+
         var client = httpClientFactory.CreateClient();
 
         var headers = new Dictionary<string, string>
@@ -117,7 +122,8 @@ public class AnthropicChatCompletionsService(IHttpClientFactory httpClientFactor
         if (response.StatusCode >= HttpStatusCode.BadRequest)
         {
             var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
-            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
                 response.StatusCode, error);
 
             throw new Exception("OpenAI对话异常" + response.StatusCode);

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorClaude/Chats/ClaudiaChatCompletionsService.cs

@@ -0,0 +1,878 @@
+using System.Diagnostics;
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorClaude.Chats;
+
+public sealed class ClaudiaChatCompletionsService(
+    IHttpClientFactory httpClientFactory,
+    ILogger<ClaudiaChatCompletionsService> logger)
+    : IChatCompletionService
+{
+    public List<ThorChatChoiceResponse> CreateResponse(AnthropicChatCompletionDto completionDto)
+    {
+        var response = new ThorChatChoiceResponse();
+        var chatMessage = new ThorChatMessage();
+        if (completionDto == null)
+        {
+            return new List<ThorChatChoiceResponse>();
+        }
+
+        if (completionDto.content.Any(x => x.type.Equals("thinking", StringComparison.OrdinalIgnoreCase)))
+        {
+            // 将推理字段合并到返回对象去
+            chatMessage.ReasoningContent = completionDto.content
+                .First(x => x.type.Equals("thinking", StringComparison.OrdinalIgnoreCase)).Thinking;
+
+            chatMessage.Role = completionDto.role;
+            chatMessage.Content = completionDto.content
+                .First(x => x.type.Equals("text", StringComparison.OrdinalIgnoreCase)).text;
+        }
+        else
+        {
+            chatMessage.Role = completionDto.role;
+            chatMessage.Content = completionDto.content
+                .FirstOrDefault()?.text;
+        }
+
+        response.Delta = chatMessage;
+        response.Message = chatMessage;
+
+        if (completionDto.content.Any(x => x.type.Equals("tool_use", StringComparison.OrdinalIgnoreCase)))
+        {
+            var toolUse = completionDto.content
+                .First(x => x.type.Equals("tool_use", StringComparison.OrdinalIgnoreCase));
+
+            chatMessage.ToolCalls =
+            [
+                new()
+                {
+                    Id = toolUse.id,
+                    Function = new ThorChatMessageFunction()
+                    {
+                        Name = toolUse.name,
+                        Arguments = JsonSerializer.Serialize(toolUse.input,
+                            ThorJsonSerializer.DefaultOptions),
+                    },
+                    Index = 0,
+                }
+            ];
+
+            return
+            [
+                response
+            ];
+        }
+
+        return new List<ThorChatChoiceResponse> { response };
+    }
+
+    private object CreateMessage(List<ThorChatMessage> messages, AiModelDescribe options)
+    {
+        var list = new List<object>();
+
+        foreach (var message in messages)
+        {
+            // 如果是图片
+            if (message.ContentCalculated is IList<ThorChatMessageContent> contentCalculated)
+            {
+                list.Add(new
+                {
+                    role = message.Role,
+                    content = (List<object>)contentCalculated.Select<ThorChatMessageContent, object>(x =>
+                    {
+                        if (x.Type == "text")
+                        {
+                            if ("true".Equals(options.ModelExtraInfo, StringComparison.OrdinalIgnoreCase))
+                            {
+                                return new
+                                {
+                                    type = "text",
+                                    text = x.Text,
+                                    cache_control = new
+                                    {
+                                        type = "ephemeral"
+                                    }
+                                };
+                            }
+
+                            return new
+                            {
+                                type = "text",
+                                text = x.Text
+                            };
+                        }
+
+                        var isBase64 = x.ImageUrl?.Url.StartsWith("http") == true;
+
+                        if ("true".Equals(options.ModelExtraInfo, StringComparison.OrdinalIgnoreCase))
+                        {
+                            return new
+                            {
+                                type = "image",
+                                source = new
+                                {
+                                    type = isBase64 ? "base64" : "url",
+                                    media_type = "image/png",
+                                    data = x.ImageUrl?.Url,
+                                },
+                                cache_control = new
+                                {
+                                    type = "ephemeral"
+                                }
+                            };
+                        }
+
+                        return new
+                        {
+                            type = "image",
+                            source = new
+                            {
+                                type = isBase64 ? "base64" : "url",
+                                media_type = "image/png",
+                                data = x.ImageUrl?.Url,
+                            }
+                        };
+                    })
+                });
+            }
+            else
+            {
+                if ("true".Equals(options.ModelExtraInfo, StringComparison.OrdinalIgnoreCase))
+                {
+                    if (message.Role == "system")
+                    {
+                        list.Add(new
+                        {
+                            type = "text",
+                            text = message.Content,
+                            cache_control = new
+                            {
+                                type = "ephemeral"
+                            }
+                        });
+                    }
+                    else
+                    {
+                        list.Add(new
+                        {
+                            role = message.Role,
+                            content = message.Content
+                        });
+                    }
+                }
+                else
+                {
+                    if (message.Role == "system")
+                    {
+                        list.Add(new
+                        {
+                            type = "text",
+                            text = message.Content
+                        });
+                    }
+                    else if (message.Role == "tool")
+                    {
+                        list.Add(new
+                        {
+                            role = "user",
+                            content = new List<object>
+                            {
+                                new
+                                {
+                                    type = "tool_result",
+                                    tool_use_id = message.ToolCallId,
+                                    content = message.Content
+                                }
+                            }
+                        });
+                    }
+                    else if (message.Role == "assistant")
+                    {
+                        // {
+                        //     "role": "assistant",
+                        //     "content": [
+                        //     {
+                        //         "type": "text",
+                        //         "text": "<thinking>I need to use get_weather, and the user wants SF, which is likely San Francisco, CA.</thinking>"
+                        //     },
+                        //     {
+                        //         "type": "tool_use",
+                        //         "id": "toolu_01A09q90qw90lq917835lq9",
+                        //         "name": "get_weather",
+                        //         "input": {
+                        //             "location": "San Francisco, CA",
+                        //             "unit": "celsius"
+                        //         }
+                        //     }
+                        //     ]
+                        // },
+                        if (message.ToolCalls?.Count > 0)
+                        {
+                            var content = new List<object>();
+                            if (!string.IsNullOrEmpty(message.Content))
+                            {
+                                content.Add(new
+                                {
+                                    type = "text",
+                                    text = message.Content
+                                });
+                            }
+
+                            foreach (var toolCall in message.ToolCalls)
+                            {
+                                content.Add(new
+                                {
+                                    type = "tool_use",
+                                    id = toolCall.Id,
+                                    name = toolCall.Function?.Name,
+                                    input = JsonSerializer.Deserialize<Dictionary<string, object>>(
+                                        toolCall.Function?.Arguments, ThorJsonSerializer.DefaultOptions)
+                                });
+                            }
+
+                            list.Add(new
+                            {
+                                role = "assistant",
+                                content
+                            });
+                        }
+                        else
+                        {
+                            list.Add(new
+                            {
+                                role = "assistant",
+                                content = new List<object>
+                                {
+                                    new
+                                    {
+                                        type = "text",
+                                        text = message.Content
+                                    }
+                                }
+                            });
+                        }
+                    }
+                    else
+                    {
+                        list.Add(new
+                        {
+                            role = message.Role,
+                            content = message.Content
+                        });
+                    }
+                }
+            }
+        }
+
+        return list;
+    }
+
+
+    public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(AiModelDescribe options,
+        ThorChatCompletionsRequest input,
+        CancellationToken cancellationToken)
+    {
+        using var openai =
+            Activity.Current?.Source.StartActivity("Claudia 对话补全");
+
+        if (string.IsNullOrEmpty(options.Endpoint))
+        {
+            options.Endpoint = "https://api.anthropic.com/";
+        }
+
+        var client = httpClientFactory.CreateClient();
+
+        var headers = new Dictionary<string, string>
+        {
+            { "x-api-key", options.ApiKey },
+            { "anthropic-version", "2023-06-01" }
+        };
+
+        var isThinking = input.Model.EndsWith("thinking");
+        input.Model = input.Model.Replace("-thinking", string.Empty);
+        var budgetTokens = 1024;
+
+        if (input.MaxTokens is < 2048)
+        {
+            input.MaxTokens = 2048;
+        }
+
+        if (input.MaxTokens != null && input.MaxTokens / 2 < 1024)
+        {
+            budgetTokens = input.MaxTokens.Value / (4 * 3);
+        }
+
+        // budgetTokens最大4096
+        budgetTokens = Math.Min(budgetTokens, 4096);
+
+        object tool_choice;
+        if (input.ToolChoice is not null && input.ToolChoice.Type == "auto")
+        {
+            tool_choice = new
+            {
+                type = "auto",
+                disable_parallel_tool_use = false,
+            };
+        }
+        else if (input.ToolChoice is not null && input.ToolChoice.Type == "any")
+        {
+            tool_choice = new
+            {
+                type = "any",
+                disable_parallel_tool_use = false,
+            };
+        }
+        else if (input.ToolChoice is not null && input.ToolChoice.Type == "tool")
+        {
+            tool_choice = new
+            {
+                type = "tool",
+                name = input.ToolChoice.Function?.Name,
+                disable_parallel_tool_use = false,
+            };
+        }
+        else
+        {
+            tool_choice = null;
+        }
+
+        var response = await client.HttpRequestRaw(options.Endpoint.TrimEnd('/') + "/v1/messages", new
+        {
+            model = input.Model,
+            max_tokens = input.MaxTokens ?? 64000,
+            stream = true,
+            tool_choice,
+            system = CreateMessage(input.Messages.Where(x => x.Role == "system").ToList(), options),
+            messages = CreateMessage(input.Messages.Where(x => x.Role != "system").ToList(), options),
+            top_p = isThinking ? null : input.TopP,
+            thinking = isThinking
+                ? new
+                {
+                    type = "enabled",
+                    budget_tokens = budgetTokens,
+                }
+                : null,
+            tools = input.Tools?.Select(x => new
+            {
+                name = x.Function?.Name,
+                description = x.Function?.Description,
+                input_schema = new
+                {
+                    type = x.Function?.Parameters?.Type,
+                    required = x.Function?.Parameters?.Required,
+                    properties = x.Function?.Parameters?.Properties?.ToDictionary(y => y.Key, y => new
+                    {
+                        description = y.Value.Description,
+                        type = y.Value.Type,
+                        @enum = y.Value.Enum
+                    })
+                }
+            }).ToArray(),
+            temperature = isThinking ? null : input.Temperature
+        }, string.Empty, headers);
+
+        openai?.SetTag("Model", input.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
+
+            throw new Exception("OpenAI对话异常" + response.StatusCode);
+        }
+
+        using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
+
+        using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken));
+        string? line = string.Empty;
+        var first = true;
+        var isThink = false;
+
+        string? toolId = null;
+        string? toolName = null;
+        while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) != null)
+        {
+            line += Environment.NewLine;
+
+            if (line.StartsWith('{'))
+            {
+                logger.LogInformation("OpenAI对话异常 , StatusCode: {StatusCode} Response: {Response}", response.StatusCode,
+                    line);
+
+                throw new Exception("OpenAI对话异常" + line);
+            }
+
+            if (line.StartsWith(OpenAIConstant.Data))
+                line = line[OpenAIConstant.Data.Length..];
+
+            line = line.Trim();
+
+            if (string.IsNullOrWhiteSpace(line)) continue;
+
+            if (line == OpenAIConstant.Done)
+            {
+                break;
+            }
+
+            if (line.StartsWith(':'))
+            {
+                continue;
+            }
+
+            if (line.StartsWith("event: ", StringComparison.OrdinalIgnoreCase))
+            {
+                continue;
+            }
+
+            var result = JsonSerializer.Deserialize<AnthropicStreamDto>(line,
+                ThorJsonSerializer.DefaultOptions);
+
+            if (result?.Type == "content_block_delta")
+            {
+                if (result.Delta.Type is "text" or "text_delta")
+                {
+                    yield return new ThorChatCompletionsResponse()
+                    {
+                        Choices =
+                        [
+                            new()
+                            {
+                                Message = new ThorChatMessage()
+                                {
+                                    Content = result.Delta.Text,
+                                    Role = "assistant",
+                                }
+                            }
+                        ],
+                        Model = input.Model,
+                        Id = result?.Message?.id,
+                        Usage = new ThorUsageResponse()
+                        {
+                            CompletionTokens = result?.Message?.Usage?.OutputTokens,
+                            PromptTokens = result?.Message?.Usage?.InputTokens,
+                        }
+                    };
+                }
+                else if (result.Delta.Type == "input_json_delta")
+                {
+                    yield return new ThorChatCompletionsResponse()
+                    {
+                        Choices =
+                        [
+                            new ThorChatChoiceResponse()
+                            {
+                                Message = new ThorChatMessage()
+                                {
+                                    ToolCalls =
+                                    [
+                                        new ThorToolCall()
+                                        {
+                                            Id = toolId,
+                                            Function = new ThorChatMessageFunction()
+                                            {
+                                                Name = toolName,
+                                                Arguments = result.Delta.PartialJson
+                                            }
+                                        }
+                                    ],
+                                    Role = "tool",
+                                }
+                            }
+                        ],
+                        Model = input.Model,
+                        Usage = new ThorUsageResponse()
+                        {
+                            PromptTokens = result?.Message?.Usage?.InputTokens,
+                        }
+                    };
+                }
+                else
+                {
+                    yield return new ThorChatCompletionsResponse()
+                    {
+                        Choices = new List<ThorChatChoiceResponse>()
+                        {
+                            new()
+                            {
+                                Message = new ThorChatMessage()
+                                {
+                                    ReasoningContent = result.Delta.Thinking,
+                                    Role = "assistant",
+                                }
+                            }
+                        },
+                        Model = input.Model,
+                        Id = result?.Message?.id,
+                        Usage = new ThorUsageResponse()
+                        {
+                            CompletionTokens = result?.Message?.Usage?.OutputTokens,
+                            PromptTokens = result?.Message?.Usage?.InputTokens
+                        }
+                    };
+                }
+
+                continue;
+            }
+
+            if (result?.Type == "content_block_start")
+            {
+                if (result?.ContentBlock?.Id is not null)
+                {
+                    toolId = result.ContentBlock.Id;
+                }
+
+                if (result?.ContentBlock?.Name is not null)
+                {
+                    toolName = result.ContentBlock.Name;
+                }
+
+                if (toolId is null)
+                {
+                    continue;
+                }
+
+                yield return new ThorChatCompletionsResponse()
+                {
+                    Choices =
+                    [
+                        new ThorChatChoiceResponse()
+                        {
+                            Message = new ThorChatMessage()
+                            {
+                                ToolCalls =
+                                [
+                                    new ThorToolCall()
+                                    {
+                                        Id = toolId,
+                                        Function = new ThorChatMessageFunction()
+                                        {
+                                            Name = toolName
+                                        }
+                                    }
+                                ],
+                                Role = "tool",
+                            }
+                        }
+                    ],
+                    Model = input.Model,
+                    Usage = new ThorUsageResponse()
+                    {
+                        PromptTokens = result?.Message?.Usage?.InputTokens,
+                    }
+                };
+            }
+
+            if (result.Type == "content_block_delta")
+            {
+                yield return new ThorChatCompletionsResponse()
+                {
+                    Choices =
+                    [
+                        new ThorChatChoiceResponse()
+                        {
+                            Message = new ThorChatMessage()
+                            {
+                                ToolCallId = result?.ContentBlock?.Id,
+                                FunctionCall = new ThorChatMessageFunction()
+                                {
+                                    Name = result?.ContentBlock?.Name,
+                                    Arguments = result?.Delta?.PartialJson
+                                },
+                                Role = "tool",
+                            }
+                        }
+                    ],
+                    Model = input.Model,
+                    Usage = new ThorUsageResponse()
+                    {
+                        PromptTokens = result?.Message?.Usage?.InputTokens
+                    }
+                };
+                continue;
+            }
+
+            if (result.Type == "message_start")
+            {
+                yield return new ThorChatCompletionsResponse()
+                {
+                    Choices =
+                    [
+                        new ThorChatChoiceResponse()
+                        {
+                            Message = new ThorChatMessage()
+                            {
+                                Content = result?.Delta?.Text,
+                                Role = "assistant",
+                            }
+                        }
+                    ],
+                    Model = input.Model,
+                    Usage = new ThorUsageResponse()
+                    {
+                        PromptTokens = result?.Message?.Usage?.InputTokens,
+                    }
+                };
+
+                continue;
+            }
+
+            if (result.Type == "message_delta")
+            {
+                var deltaOutput = new ThorChatCompletionsResponse()
+                {
+                    Choices =
+                    [
+                        new ThorChatChoiceResponse()
+                        {
+                            Message = new ThorChatMessage()
+                            {
+                                Content = result.Delta?.Text,
+                                Role = "assistant",
+                            }
+                        }
+                    ],
+                    Model = input.Model,
+                    Usage = new ThorUsageResponse
+                    {
+                        InputTokens = result.Usage?.InputTokens + result.Usage?.CacheCreationInputTokens +
+                                      result.Usage?.CacheReadInputTokens,
+                        OutputTokens = result.Usage?.OutputTokens,
+                    }
+                };
+
+
+                deltaOutput.Usage.PromptTokens = deltaOutput.Usage.InputTokens;
+                deltaOutput.Usage.CompletionTokens = deltaOutput.Usage.OutputTokens;
+
+                deltaOutput.Usage.TotalTokens = deltaOutput.Usage.InputTokens + deltaOutput.Usage.OutputTokens;
+
+                yield return deltaOutput;
+
+                continue;
+            }
+
+            if (result.Message == null)
+            {
+                continue;
+            }
+
+            var chat = CreateResponse(result.Message);
+
+            var content = chat?.FirstOrDefault()?.Delta;
+
+            if (first && string.IsNullOrWhiteSpace(content?.Content) && string.IsNullOrEmpty(content?.ReasoningContent))
+            {
+                continue;
+            }
+
+            if (first && content.Content == OpenAIConstant.ThinkStart)
+            {
+                isThink = true;
+                continue;
+                // 需要将content的内容转换到其他字段
+            }
+
+            if (isThink && content.Content.Contains(OpenAIConstant.ThinkEnd))
+            {
+                isThink = false;
+                // 需要将content的内容转换到其他字段
+                continue;
+            }
+
+            if (isThink)
+            {
+                // 需要将content的内容转换到其他字段
+                foreach (var choice in chat)
+                {
+                    choice.Delta.ReasoningContent = choice.Delta.Content;
+                    choice.Delta.Content = string.Empty;
+                }
+            }
+
+            first = false;
+
+            var output = new ThorChatCompletionsResponse()
+            {
+                Choices = chat,
+                Model = input.Model,
+                Id = result.Message.id,
+                Usage = new ThorUsageResponse()
+                {
+                    InputTokens = result.Message.Usage?.InputTokens + result.Message.Usage?.CacheCreationInputTokens +
+                                  result.Message.Usage?.CacheReadInputTokens,
+                    OutputTokens = result.Message.Usage?.OutputTokens,
+                }
+            };
+            output.Usage.PromptTokens = output.Usage.InputTokens;
+            output.Usage.CompletionTokens = output.Usage.OutputTokens;
+            output.Usage.TotalTokens = output.Usage.InputTokens + output.Usage.OutputTokens;
+
+            yield return output;
+        }
+    }
+
+    public async Task<ThorChatCompletionsResponse> CompleteChatAsync(AiModelDescribe options,
+        ThorChatCompletionsRequest input,
+        CancellationToken cancellationToken)
+    {
+        using var openai =
+            Activity.Current?.Source.StartActivity("Claudia 对话补全");
+
+        if (string.IsNullOrEmpty(options.Endpoint))
+        {
+            options.Endpoint = "https://api.anthropic.com/";
+        }
+
+        var client = httpClientFactory.CreateClient();
+
+        var headers = new Dictionary<string, string>
+        {
+            { "x-api-key", options.ApiKey },
+            { "anthropic-version", "2023-06-01" }
+        };
+
+        bool isThink = input.Model.EndsWith("-thinking");
+        input.Model = input.Model.Replace("-thinking", string.Empty);
+
+        var budgetTokens = 1024;
+        if (input.MaxTokens is < 2048)
+        {
+            input.MaxTokens = 2048;
+        }
+
+        if (input.MaxTokens != null && input.MaxTokens / 2 < 1024)
+        {
+            budgetTokens = input.MaxTokens.Value / (4 * 3);
+        }
+
+        object tool_choice;
+        if (input.ToolChoice is not null && input.ToolChoice.Type == "auto")
+        {
+            tool_choice = new
+            {
+                type = "auto",
+                disable_parallel_tool_use = false,
+            };
+        }
+        else if (input.ToolChoice is not null && input.ToolChoice.Type == "any")
+        {
+            tool_choice = new
+            {
+                type = "any",
+                disable_parallel_tool_use = false,
+            };
+        }
+        else if (input.ToolChoice is not null && input.ToolChoice.Type == "tool")
+        {
+            tool_choice = new
+            {
+                type = "tool",
+                name = input.ToolChoice.Function?.Name,
+                disable_parallel_tool_use = false,
+            };
+        }
+        else
+        {
+            tool_choice = null;
+        }
+
+        // budgetTokens最大4096
+        budgetTokens = Math.Min(budgetTokens, 4096);
+
+        var response = await client.PostJsonAsync(options.Endpoint.TrimEnd('/') + "/v1/messages", new
+        {
+            model = input.Model,
+            max_tokens = input.MaxTokens ?? 2000,
+            system = CreateMessage(input.Messages.Where(x => x.Role == "system").ToList(), options),
+            messages = CreateMessage(input.Messages.Where(x => x.Role != "system").ToList(), options),
+            top_p = isThink ? null : input.TopP,
+            tool_choice,
+            thinking = isThink
+                ? new
+                {
+                    type = "enabled",
+                    budget_tokens = budgetTokens,
+                }
+                : null,
+            tools = input.Tools?.Select(x => new
+            {
+                name = x.Function?.Name,
+                description = x.Function?.Description,
+                input_schema = new
+                {
+                    type = x.Function?.Parameters?.Type,
+                    required = x.Function?.Parameters?.Required,
+                    properties = x.Function?.Parameters?.Properties?.ToDictionary(y => y.Key, y => new
+                    {
+                        description = y.Value.Description,
+                        type = y.Value.Type,
+                        @enum = y.Value.Enum
+                    })
+                }
+            }).ToArray(),
+            temperature = isThink ? null : input.Temperature
+        }, string.Empty, headers);
+
+        openai?.SetTag("Model", input.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI对话异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
+
+            throw new Exception("OpenAI对话异常" + response.StatusCode.ToString());
+        }
+
+        var value =
+            await response.Content.ReadFromJsonAsync<AnthropicChatCompletionDto>(ThorJsonSerializer.DefaultOptions,
+                cancellationToken: cancellationToken);
+
+        var thor = new ThorChatCompletionsResponse()
+        {
+            Choices = CreateResponse(value),
+            Model = input.Model,
+            Id = value.id,
+            Usage = new ThorUsageResponse()
+            {
+                CompletionTokens = value.Usage.OutputTokens,
+                PromptTokens = value.Usage.InputTokens
+            }
+        };
+
+        if (value.Usage.CacheReadInputTokens != null)
+        {
+            thor.Usage.PromptTokensDetails ??= new ThorUsageResponsePromptTokensDetails()
+            {
+                CachedTokens = value.Usage.CacheReadInputTokens.Value,
+            };
+
+            if (value.Usage.InputTokens > 0)
+            {
+                thor.Usage.InputTokens = value.Usage.InputTokens;
+            }
+
+            if (value.Usage.OutputTokens > 0)
+            {
+                thor.Usage.CompletionTokens = value.Usage.OutputTokens;
+                thor.Usage.OutputTokens = value.Usage.OutputTokens;
+            }
+        }
+
+        thor.Usage.TotalTokens = thor.Usage.InputTokens + thor.Usage.OutputTokens;
+        return thor;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/CustomOpenAIAnthropicChatCompletionsService.cs

@@ -1,313 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using Volo.Abp.DependencyInjection;
-using Yi.Framework.AiHub.Domain.Shared.Dtos;
-using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
-
-namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
-
-/// <summary>
-/// OpenAI到Claude适配器服务
-/// 将Claude格式的请求转换为OpenAI格式，然后将OpenAI的响应转换为Claude格式
-/// </summary>
-public class CustomOpenAIAnthropicChatCompletionsService(
-    IAbpLazyServiceProvider serviceProvider,
-    ILogger<CustomOpenAIAnthropicChatCompletionsService> logger)
-    : IAnthropicChatCompletionService
-{
-    private IChatCompletionService GetChatCompletionService()
-    {
-        return serviceProvider.GetRequiredKeyedService<IChatCompletionService>(nameof(OpenAiChatCompletionsService));
-    }
-
-    public async Task<AnthropicChatCompletionDto> ChatCompletionsAsync(AiModelDescribe aiModelDescribe,
-        AnthropicInput request,
-        CancellationToken cancellationToken = default)
-    {
-        // 转换请求格式：Claude -> OpenAI
-        var openAIRequest = AnthropicToOpenAi.ConvertAnthropicToOpenAi(request);
-
-        if (openAIRequest.Model.StartsWith("gpt-5"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-        }
-        else if (openAIRequest.Model.StartsWith("o3-mini") || openAIRequest.Model.StartsWith("o4-mini"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-            openAIRequest.Temperature = null;
-        }
-
-        // 调用OpenAI服务
-        var openAIResponse =
-            await GetChatCompletionService().CompleteChatAsync(aiModelDescribe,openAIRequest, cancellationToken);
-
-        // 转换响应格式：OpenAI -> Claude
-        var claudeResponse = AnthropicToOpenAi.ConvertOpenAIToClaude(openAIResponse, request);
-
-        return claudeResponse;
-    }
-
-    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> StreamChatCompletionsAsync(AiModelDescribe aiModelDescribe,
-        AnthropicInput request,
-        CancellationToken cancellationToken = default)
-    {
-        var openAIRequest = AnthropicToOpenAi.ConvertAnthropicToOpenAi(request);
-        openAIRequest.Stream = true;
-
-        if (openAIRequest.Model.StartsWith("gpt-5"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-        }
-        else if (openAIRequest.Model.StartsWith("o3-mini") || openAIRequest.Model.StartsWith("o4-mini"))
-        {
-            openAIRequest.MaxCompletionTokens = request.MaxTokens;
-            openAIRequest.MaxTokens = null;
-            openAIRequest.Temperature = null;
-        }
-
-        var messageId = Guid.NewGuid().ToString();
-        var hasStarted = false;
-        var hasTextContentBlockStarted = false;
-        var hasThinkingContentBlockStarted = false;
-        var toolBlocksStarted = new Dictionary<int, bool>(); // 使用索引而不是ID
-        var toolCallIds = new Dictionary<int, string>(); // 存储每个索引对应的ID
-        var toolCallIndexToBlockIndex = new Dictionary<int, int>(); // 工具调用索引到块索引的映射
-        var accumulatedUsage = new AnthropicCompletionDtoUsage();
-        var isFinished = false;
-        var currentContentBlockType = ""; // 跟踪当前内容块类型
-        var currentBlockIndex = 0; // 跟踪当前块索引
-        var lastContentBlockType = ""; // 跟踪最后一个内容块类型，用于确定停止原因
-
-        await foreach (var openAIResponse in GetChatCompletionService().CompleteChatStreamAsync(aiModelDescribe,openAIRequest,
-                           cancellationToken))
-        {
-            // 发送message_start事件
-            if (!hasStarted && openAIResponse.Choices?.Count > 0 &&
-                openAIResponse.Choices.Any(x => x.Delta.ToolCalls?.Count > 0) == false)
-            {
-                hasStarted = true;
-                var messageStartEvent = AnthropicToOpenAi.CreateMessageStartEvent(messageId, request.Model);
-                yield return ("message_start", messageStartEvent);
-            }
-
-            // 更新使用情况统计
-            if (openAIResponse.Usage != null)
-            {
-                // 使用最新的token计数（OpenAI通常在最后的响应中提供完整的统计）
-                if (openAIResponse.Usage.PromptTokens.HasValue)
-                {
-                    accumulatedUsage.InputTokens = openAIResponse.Usage.PromptTokens.Value;
-                }
-
-                if (openAIResponse.Usage.CompletionTokens.HasValue)
-                {
-                    accumulatedUsage.OutputTokens = (int)openAIResponse.Usage.CompletionTokens.Value;
-                }
-
-                if (openAIResponse.Usage.PromptTokensDetails?.CachedTokens.HasValue == true)
-                {
-                    accumulatedUsage.CacheReadInputTokens =
-                        openAIResponse.Usage.PromptTokensDetails.CachedTokens.Value;
-                }
-
-                // 记录调试信息
-                logger.LogDebug("OpenAI Usage更新: Input={InputTokens}, Output={OutputTokens}, CacheRead={CacheRead}",
-                    accumulatedUsage.InputTokens, accumulatedUsage.OutputTokens,
-                    accumulatedUsage.CacheReadInputTokens);
-            }
-
-            if (openAIResponse.Choices is { Count: > 0 })
-            {
-                var choice = openAIResponse.Choices.First();
-
-                // 处理内容
-                if (!string.IsNullOrEmpty(choice.Delta?.Content))
-                {
-                    // 如果当前有其他类型的内容块在运行，先结束它们
-                    if (currentContentBlockType != "text" && !string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        stopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop", stopEvent);
-                        currentBlockIndex++; // 切换内容块时增加索引
-                        currentContentBlockType = "";
-                    }
-
-                    // 发送content_block_start事件（仅第一次）
-                    if (!hasTextContentBlockStarted || currentContentBlockType != "text")
-                    {
-                        hasTextContentBlockStarted = true;
-                        currentContentBlockType = "text";
-                        lastContentBlockType = "text";
-                        var contentBlockStartEvent = AnthropicToOpenAi.CreateContentBlockStartEvent();
-                        contentBlockStartEvent.Index = currentBlockIndex;
-                        yield return ("content_block_start",
-                            contentBlockStartEvent);
-                    }
-
-                    // 发送content_block_delta事件
-                    var contentDeltaEvent = AnthropicToOpenAi.CreateContentBlockDeltaEvent(choice.Delta.Content);
-                    contentDeltaEvent.Index = currentBlockIndex;
-                    yield return ("content_block_delta",
-                        contentDeltaEvent);
-                }
-
-                // 处理工具调用
-                if (choice.Delta?.ToolCalls is { Count: > 0 })
-                {
-                    foreach (var toolCall in choice.Delta.ToolCalls)
-                    {
-                        var toolCallIndex = toolCall.Index; // 使用索引来标识工具调用
-
-                        // 发送tool_use content_block_start事件
-                        if (toolBlocksStarted.TryAdd(toolCallIndex, true))
-                        {
-                            // 如果当前有文本或thinking内容块在运行，先结束它们
-                            if (currentContentBlockType == "text" || currentContentBlockType == "thinking")
-                            {
-                                var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                                stopEvent.Index = currentBlockIndex;
-                                yield return ("content_block_stop", stopEvent);
-                                currentBlockIndex++; // 增加块索引
-                            }
-                            // 如果当前有其他工具调用在运行，也需要结束它们
-                            else if (currentContentBlockType == "tool_use")
-                            {
-                                var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                                stopEvent.Index = currentBlockIndex;
-                                yield return ("content_block_stop", stopEvent);
-                                currentBlockIndex++; // 增加块索引
-                            }
-
-                            currentContentBlockType = "tool_use";
-                            lastContentBlockType = "tool_use";
-
-                            // 为此工具调用分配一个新的块索引
-                            toolCallIndexToBlockIndex[toolCallIndex] = currentBlockIndex;
-
-                            // 保存工具调用的ID（如果有的话）
-                            if (!string.IsNullOrEmpty(toolCall.Id))
-                            {
-                                toolCallIds[toolCallIndex] = toolCall.Id;
-                            }
-                            else if (!toolCallIds.ContainsKey(toolCallIndex))
-                            {
-                                // 如果没有ID且之前也没有保存过，生成一个新的ID
-                                toolCallIds[toolCallIndex] = Guid.NewGuid().ToString();
-                            }
-
-                            var toolBlockStartEvent = AnthropicToOpenAi.CreateToolBlockStartEvent(
-                                toolCallIds[toolCallIndex],
-                                toolCall.Function?.Name);
-                            toolBlockStartEvent.Index = currentBlockIndex;
-                            yield return ("content_block_start",
-                                toolBlockStartEvent);
-                        }
-
-                        // 如果有增量的参数，发送content_block_delta事件
-                        if (!string.IsNullOrEmpty(toolCall.Function?.Arguments))
-                        {
-                            var toolDeltaEvent =
-                                AnthropicToOpenAi.CreateToolBlockDeltaEvent(toolCall.Function.Arguments);
-                            // 使用该工具调用对应的块索引
-                            toolDeltaEvent.Index = toolCallIndexToBlockIndex[toolCallIndex];
-                            yield return ("content_block_delta",
-                                toolDeltaEvent);
-                        }
-                    }
-                }
-
-                // 处理推理内容
-                if (!string.IsNullOrEmpty(choice.Delta?.ReasoningContent))
-                {
-                    // 如果当前有其他类型的内容块在运行，先结束它们
-                    if (currentContentBlockType != "thinking" && !string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var stopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        stopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop", stopEvent);
-                        currentBlockIndex++; // 增加块索引
-                        currentContentBlockType = "";
-                    }
-
-                    // 对于推理内容，也需要发送对应的事件
-                    if (!hasThinkingContentBlockStarted || currentContentBlockType != "thinking")
-                    {
-                        hasThinkingContentBlockStarted = true;
-                        currentContentBlockType = "thinking";
-                        lastContentBlockType = "thinking";
-                        var thinkingBlockStartEvent = AnthropicToOpenAi.CreateThinkingBlockStartEvent();
-                        thinkingBlockStartEvent.Index = currentBlockIndex;
-                        yield return ("content_block_start",
-                            thinkingBlockStartEvent);
-                    }
-
-                    var thinkingDeltaEvent =
-                        AnthropicToOpenAi.CreateThinkingBlockDeltaEvent(choice.Delta.ReasoningContent);
-                    thinkingDeltaEvent.Index = currentBlockIndex;
-                    yield return ("content_block_delta",
-                        thinkingDeltaEvent);
-                }
-
-                // 处理结束
-                if (!string.IsNullOrEmpty(choice.FinishReason) && !isFinished)
-                {
-                    isFinished = true;
-
-                    // 发送content_block_stop事件（如果有活跃的内容块）
-                    if (!string.IsNullOrEmpty(currentContentBlockType))
-                    {
-                        var contentBlockStopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                        contentBlockStopEvent.Index = currentBlockIndex;
-                        yield return ("content_block_stop",
-                            contentBlockStopEvent);
-                    }
-
-                    // 发送message_delta事件
-                    var messageDeltaEvent = AnthropicToOpenAi.CreateMessageDeltaEvent(
-                        AnthropicToOpenAi.GetStopReasonByLastContentType(choice.FinishReason, lastContentBlockType),
-                        accumulatedUsage);
-
-                    // 记录最终Usage统计
-                    logger.LogDebug(
-                        "流式响应结束，最终Usage: Input={InputTokens}, Output={OutputTokens}, CacheRead={CacheRead}",
-                        accumulatedUsage.InputTokens, accumulatedUsage.OutputTokens,
-                        accumulatedUsage.CacheReadInputTokens);
-
-                    yield return ("message_delta",
-                        messageDeltaEvent);
-
-                    // 发送message_stop事件
-                    var messageStopEvent = AnthropicToOpenAi.CreateMessageStopEvent();
-                    yield return ("message_stop",
-                        messageStopEvent);
-                }
-            }
-        }
-
-        // 确保流正确结束
-        if (!isFinished)
-        {
-            if (!string.IsNullOrEmpty(currentContentBlockType))
-            {
-                var contentBlockStopEvent = AnthropicToOpenAi.CreateContentBlockStopEvent();
-                contentBlockStopEvent.Index = currentBlockIndex;
-                yield return ("content_block_stop",
-                    contentBlockStopEvent);
-            }
-
-            var messageDeltaEvent =
-                AnthropicToOpenAi.CreateMessageDeltaEvent(
-                    AnthropicToOpenAi.GetStopReasonByLastContentType("end_turn", lastContentBlockType),
-                    accumulatedUsage);
-            yield return ("message_delta", messageDeltaEvent);
-
-            var messageStopEvent = AnthropicToOpenAi.CreateMessageStopEvent();
-            yield return ("message_stop",
-                messageStopEvent);
-        }
-    }
-}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAIChatCompletionsService.cs

@@ -130,7 +130,7 @@ public sealed class OpenAiChatCompletionsService(ILogger<OpenAiChatCompletionsSe
         using var openai =
             Activity.Current?.Source.StartActivity("OpenAI 对话补全");
 
-        var response = await HttpClientFactory.GetHttpClient(options.Endpoint).PostJsonAsync(
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
             options?.Endpoint.TrimEnd('/') + "/chat/completions",
             chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/AiGateWay/Impl/ThorCustomOpenAI/Chats/OpenAiResponseService.cs

@@ -0,0 +1,123 @@
+using System.Diagnostics;
+using System.Net;
+using System.Net.Http.Json;
+using System.Text.Json;
+using Microsoft.Extensions.Logging;
+using Yi.Framework.AiHub.Domain.AiGateWay.Exceptions;
+using Yi.Framework.AiHub.Domain.Shared.Dtos;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+
+namespace Yi.Framework.AiHub.Domain.AiGateWay.Impl.ThorCustomOpenAI.Chats;
+
+public class OpenAiResponseService(ILogger<OpenAiResponseService> logger,IHttpClientFactory httpClientFactory):IOpenAiResponseService
+{
+    
+    public async IAsyncEnumerable<(string, JsonElement?)> ResponsesStreamAsync(AiModelDescribe options, OpenAiResponsesInput input,
+        CancellationToken cancellationToken)
+    {
+         using var openai =
+            Activity.Current?.Source.StartActivity("OpenAi 响应");
+
+        
+        var client = httpClientFactory.CreateClient();
+        
+        var response = await client.HttpRequestRaw(options.Endpoint.TrimEnd('/') + "/responses", input, options.ApiKey);
+
+        openai?.SetTag("Model", input.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI响应异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}",
+                options.Endpoint,
+                response.StatusCode, error);
+
+            throw new Exception("OpenAI响应异常" + response.StatusCode);
+        }
+
+        using var stream = new StreamReader(await response.Content.ReadAsStreamAsync(cancellationToken));
+
+        using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken));
+        string? line = string.Empty;
+
+        string? data = null;
+        string eventType = string.Empty;
+
+        while ((line = await reader.ReadLineAsync(cancellationToken).ConfigureAwait(false)) != null)
+        {
+            line += Environment.NewLine;
+
+            if (line.StartsWith('{'))
+            {
+                logger.LogInformation("OpenAI响应异常 , StatusCode: {StatusCode} Response: {Response}", response.StatusCode,
+                    line);
+
+                throw new Exception("OpenAI响应异常" + line);
+            }
+
+            if (string.IsNullOrWhiteSpace(line))
+            {
+                continue;
+            }
+
+            if (line.StartsWith("event:"))
+            {
+                eventType = line;
+                continue;
+            }
+
+            if (!line.StartsWith(OpenAIConstant.Data)) continue;
+
+            data = line[OpenAIConstant.Data.Length..].Trim();
+
+            var result = JsonSerializer.Deserialize<JsonElement>(data,
+                ThorJsonSerializer.DefaultOptions);
+
+            yield return (eventType, result);
+        }
+    }
+
+    public async Task<OpenAiResponsesOutput> ResponsesAsync(AiModelDescribe options, OpenAiResponsesInput chatCompletionCreate,
+        CancellationToken cancellationToken)
+    {
+        using var openai =
+            Activity.Current?.Source.StartActivity("OpenAI 响应");
+
+        var response = await httpClientFactory.CreateClient().PostJsonAsync(
+            options?.Endpoint.TrimEnd('/') + "/responses",
+            chatCompletionCreate, options.ApiKey).ConfigureAwait(false);
+
+        openai?.SetTag("Model", chatCompletionCreate.Model);
+        openai?.SetTag("Response", response.StatusCode.ToString());
+
+        if (response.StatusCode == HttpStatusCode.Unauthorized)
+        {
+            throw new BusinessException("渠道未登录,请联系管理人员", "401");
+        }
+
+        // 如果限流则抛出限流异常
+        if (response.StatusCode == HttpStatusCode.TooManyRequests)
+        {
+            throw new ThorRateLimitException();
+        }
+
+        // 大于等于400的状态码都认为是异常
+        if (response.StatusCode >= HttpStatusCode.BadRequest)
+        {
+            var error = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
+            logger.LogError("OpenAI 响应异常 请求地址：{Address}, StatusCode: {StatusCode} Response: {Response}", options.Endpoint,
+                response.StatusCode, error);
+
+            throw new BusinessException("OpenAI响应异常", response.StatusCode.ToString());
+        }
+
+        var result =
+            await response.Content.ReadFromJsonAsync<OpenAiResponsesOutput>(
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+        return result;
+    }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/AiRechargeAggregateRoot.cs

@@ -1,5 +1,6 @@
 using SqlSugar;
 using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 
 namespace Yi.Framework.AiHub.Domain.Entities;
 
@@ -13,7 +14,7 @@ public class AiRechargeAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// 充值金额
     /// </summary>
     public decimal RechargeAmount { get; set; }
-    
+
     /// <summary>
     /// 用户
     /// </summary>
@@ -33,9 +34,14 @@ public class AiRechargeAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// 到期时间
     /// </summary>
     public DateTime? ExpireDateTime { get; set; }
-    
+
     /// <summary>
     /// 联系方式
     /// </summary>
     public string? ContactInfo { get; set; }
+
+    /// <summary>
+    /// 订单类型
+    /// </summary>
+    public RechargeTypeEnum RechargeType { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/AnnouncementAggregateRoot.cs

@@ -0,0 +1,57 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 公告日志
+/// </summary>
+[SugarTable("Ai_Announcement")]
+public class AnnouncementAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public AnnouncementAggregateRoot()
+    {
+    }
+    
+    /// <summary>
+    /// 标题
+    /// </summary>
+    public string Title { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 内容列表（JSON格式存储）
+    /// </summary>
+    [SugarColumn(IsJson = true, IsNullable = false)]
+    public List<string> Content { get; set; } = new List<string>();
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 图片url
+    /// </summary>
+    public string? ImageUrl { get; set; }
+    
+    /// <summary>
+    /// 开始时间（系统公告时间、活动开始时间）
+    /// </summary>
+    public DateTime StartTime { get; set; }
+
+    /// <summary>
+    /// 活动结束时间
+    /// </summary>
+    public DateTime? EndTime { get; set; }
+    
+    /// <summary>
+    /// 公告类型（系统、活动）
+    /// </summary>
+    public AnnouncementTypeEnum Type{ get; set; }
+
+    /// <summary>
+    /// 跳转链接
+    /// </summary>
+    public string? Url { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/CardFlipTaskAggregateRoot.cs

@@ -0,0 +1,146 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 翻牌任务记录
+/// </summary>
+[SugarTable("Ai_CardFlipTask")]
+[SugarIndex($"index_{nameof(UserId)}_{nameof(WeekStartDate)}",
+    nameof(UserId), OrderByType.Asc,
+    nameof(WeekStartDate), OrderByType.Desc)]
+public class CardFlipTaskAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public CardFlipTaskAggregateRoot()
+    {
+    }
+
+    public CardFlipTaskAggregateRoot(Guid userId, DateTime weekStartDate)
+    {
+        UserId = userId;
+        WeekStartDate = weekStartDate.Date; // 确保只存储日期部分
+        TotalFlips = 0;
+        FreeFlipsUsed = 0;
+        BonusFlipsUsed = 0;
+        InviteFlipsUsed = 0;
+        IsFirstFlipDone = false;
+        FlippedOrder = new List<int>();
+        WinRecords = new Dictionary<int, long>();
+    }
+
+    /// <summary>
+    /// 用户ID
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 本周开始日期（每周一）
+    /// </summary>
+    public DateTime WeekStartDate { get; set; }
+
+    /// <summary>
+    /// 总共已翻牌次数
+    /// </summary>
+    public int TotalFlips { get; set; }
+
+    /// <summary>
+    /// 已使用的免费次数（最多7次）
+    /// </summary>
+    public int FreeFlipsUsed { get; set; }
+
+    /// <summary>
+    /// 已使用的赠送次数（已废弃，保持为0）
+    /// </summary>
+    public int BonusFlipsUsed { get; set; }
+
+    /// <summary>
+    /// 已使用的邀请解锁次数（最多3次）
+    /// </summary>
+    public int InviteFlipsUsed { get; set; }
+
+    /// <summary>
+    /// 是否已完成首次翻牌（用于判断是否创建任务）
+    /// </summary>
+    public bool IsFirstFlipDone { get; set; }
+
+    /// <summary>
+    /// 中奖记录（以翻牌顺序为key，例如第1次翻牌中奖则key为1，奖励金额为value）
+    /// </summary>
+    [SugarColumn(IsJson = true, IsNullable = true)]
+    public Dictionary<int, long>? WinRecords { get; set; }
+
+    /// <summary>
+    /// 备注信息
+    /// </summary>
+    [SugarColumn(Length = 500, IsNullable = true)]
+    public string? Remark { get; set; }
+
+    /// <summary>
+    /// 已翻牌的顺序（存储用户实际翻牌的序号列表，如[3,7,1,5]表示依次翻了3号、7号、1号、5号牌）
+    /// </summary>
+    [SugarColumn(IsJson = true, IsNullable = true)]
+    public List<int>? FlippedOrder { get; set; }
+
+    /// <summary>
+    /// 增加翻牌次数
+    /// </summary>
+    /// <param name="flipType">翻牌类型</param>
+    public void IncrementFlip(FlipType flipType)
+    {
+        TotalFlips++;
+
+        switch (flipType)
+        {
+            case FlipType.Free:
+                FreeFlipsUsed++;
+                break;
+            case FlipType.Bonus:
+                BonusFlipsUsed++;
+                break;
+            case FlipType.Invite:
+                InviteFlipsUsed++;
+                break;
+        }
+
+        if (!IsFirstFlipDone)
+        {
+            IsFirstFlipDone = true;
+        }
+    }
+
+    /// <summary>
+    /// 记录中奖
+    /// </summary>
+    /// <param name="flipCount">第几次翻牌（1-10）</param>
+    /// <param name="amount">奖励金额</param>
+    public void SetWinReward(int flipCount, long amount)
+    {
+        if (WinRecords == null)
+        {
+            WinRecords = new Dictionary<int, long>();
+        }
+        WinRecords[flipCount] = amount;
+    }
+}
+
+/// <summary>
+/// 翻牌类型枚举
+/// </summary>
+public enum FlipType
+{
+    /// <summary>
+    /// 免费翻牌（1-7次）
+    /// </summary>
+    Free = 0,
+
+    /// <summary>
+    /// 赠送翻牌（已废弃）
+    /// </summary>
+    Bonus = 1,
+
+    /// <summary>
+    /// 邀请解锁翻牌（8-10次）
+    /// </summary>
+    Invite = 2
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Chat/MessageAggregateRoot.cs

@@ -20,11 +20,13 @@ public class MessageAggregateRoot : FullAuditedAggregateRoot<Guid>
     }
 
     public MessageAggregateRoot(Guid? userId, Guid? sessionId, string content, string role, string modelId,
-        ThorUsageResponse? tokenUsage)
+        ThorUsageResponse? tokenUsage, Guid? tokenId = null)
     {
         UserId = userId;
         SessionId = sessionId;
-        Content = content;
+        TokenId = tokenId ?? Guid.Empty;
+        //如果没有会话，不存储对话内容
+        Content = sessionId is null ? null : content;
         Role = role;
         ModelId = modelId;
         if (tokenUsage is not null)
@@ -58,6 +60,11 @@ public class MessageAggregateRoot : FullAuditedAggregateRoot<Guid>
     public Guid? UserId { get; set; }
     public Guid? SessionId { get; set; }
 
+    /// <summary>
+    /// Token密钥Id（通过API调用时记录，Web调用为Guid.Empty）
+    /// </summary>
+    public Guid TokenId { get; set; }
+
     [SugarColumn(ColumnDataType = StaticConfig.CodeFirst_BigString)]
     public string? Content { get; set; }
 

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/DailyTaskRewardRecordAggregateRoot.cs

@@ -0,0 +1,57 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 每日任务奖励领取记录
+/// </summary>
+[SugarTable("Ai_DailyTaskRewardRecord")]
+[SugarIndex($"index_{nameof(UserId)}_{nameof(TaskDate)}",
+    nameof(UserId), OrderByType.Asc,
+    nameof(TaskDate), OrderByType.Desc)]
+public class DailyTaskRewardRecordAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public DailyTaskRewardRecordAggregateRoot()
+    {
+    }
+
+    public DailyTaskRewardRecordAggregateRoot(Guid userId, int taskLevel, DateTime taskDate, long rewardTokens)
+    {
+        UserId = userId;
+        TaskLevel = taskLevel;
+        TaskDate = taskDate.Date; // 确保只存储日期部分
+        RewardTokens = rewardTokens;
+        IsRewarded = true;
+    }
+
+    /// <summary>
+    /// 用户ID
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 任务等级（1=1000w任务，2=3000w任务）
+    /// </summary>
+    public int TaskLevel { get; set; }
+
+    /// <summary>
+    /// 任务日期（只包含日期，不包含时间）
+    /// </summary>
+    public DateTime TaskDate { get; set; }
+
+    /// <summary>
+    /// 奖励的Token数量
+    /// </summary>
+    public long RewardTokens { get; set; }
+
+    /// <summary>
+    /// 是否已发放奖励
+    /// </summary>
+    public bool IsRewarded { get; set; }
+
+    /// <summary>
+    /// 备注信息
+    /// </summary>
+    public string? Remark { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/InvitationRecordAggregateRoot.cs

@@ -0,0 +1,76 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 邀请记录
+/// </summary>
+[SugarTable("Ai_InvitationRecord")]
+[SugarIndex($"index_{nameof(InviterId)}_{nameof(InvitedUserId)}",
+    nameof(InviterId), OrderByType.Asc,
+    nameof(InvitedUserId), OrderByType.Asc)]
+[SugarIndex($"index_{nameof(InvitedUserId)}", nameof(InvitedUserId), OrderByType.Asc)]
+public class InvitationRecordAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public InvitationRecordAggregateRoot()
+    {
+    }
+
+    public InvitationRecordAggregateRoot(Guid inviterId, Guid invitedUserId, string inviteCode)
+    {
+        InviterId = inviterId;
+        InvitedUserId = invitedUserId;
+        InviteCode = inviteCode;
+        InvitationTime = DateTime.Now;
+        Status = InvitationStatus.Valid;
+    }
+
+    /// <summary>
+    /// 邀请人ID
+    /// </summary>
+    public Guid InviterId { get; set; }
+
+    /// <summary>
+    /// 被邀请人ID
+    /// </summary>
+    public Guid InvitedUserId { get; set; }
+
+    /// <summary>
+    /// 使用的邀请码
+    /// </summary>
+    [SugarColumn(Length = 50)]
+    public string InviteCode { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 邀请时间
+    /// </summary>
+    public DateTime InvitationTime { get; set; }
+
+    /// <summary>
+    /// 邀请状态（0=有效，1=已撤销）
+    /// </summary>
+    public InvitationStatus Status { get; set; }
+
+    /// <summary>
+    /// 备注信息
+    /// </summary>
+    [SugarColumn(Length = 500, IsNullable = true)]
+    public string? Remark { get; set; }
+}
+
+/// <summary>
+/// 邀请状态枚举
+/// </summary>
+public enum InvitationStatus
+{
+    /// <summary>
+    /// 有效
+    /// </summary>
+    Valid = 0,
+
+    /// <summary>
+    /// 已撤销
+    /// </summary>
+    Revoked = 1
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/InviteCodeAggregateRoot.cs

@@ -0,0 +1,47 @@
+using SqlSugar;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Yi.Framework.AiHub.Domain.Entities;
+
+/// <summary>
+/// 用户邀请码
+/// </summary>
+[SugarTable("Ai_InviteCode")]
+[SugarIndex($"index_{nameof(UserId)}", nameof(UserId), OrderByType.Asc, true)]
+[SugarIndex($"index_{nameof(Code)}", nameof(Code), OrderByType.Asc, true)]
+public class InviteCodeAggregateRoot : FullAuditedAggregateRoot<Guid>
+{
+    public InviteCodeAggregateRoot()
+    {
+    }
+
+    public InviteCodeAggregateRoot(Guid userId, string code)
+    {
+        UserId = userId;
+        Code = code;
+        UsedCount = 0;
+    }
+
+    /// <summary>
+    /// 用户ID（邀请码拥有者）
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 邀请码（唯一）
+    /// </summary>
+    [SugarColumn(Length = 50)]
+    public string Code { get; set; } = string.Empty;
+    
+    /// <summary>
+    /// 被使用次数（统计用，一个邀请码可以被多人使用）
+    /// </summary>
+    public int UsedCount { get; set; }
+
+    /// <summary>
+    /// 备注信息
+    /// </summary>
+    [SugarColumn(Length = 500, IsNullable = true)]
+    public string? Remark { get; set; }
+    
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/Model/AiModelEntity.cs

@@ -52,7 +52,32 @@ public class AiModelEntity : Entity<Guid>, IOrderNum, ISoftDelete
     public string? ExtraInfo { get; set; }
 
     /// <summary>
-    /// 模型类型
+    /// 模型类型(聊天/图片等)
     /// </summary>
     public ModelTypeEnum ModelType { get; set; }
+
+    /// <summary>
+    /// 模型Api类型，现支持同一个模型id，多种接口格式
+    /// </summary>
+    public ModelApiTypeEnum ModelApiType { get; set; }
+
+    /// <summary>
+    /// 模型倍率
+    /// </summary>
+    public decimal Multiplier { get; set; } = 1;
+    
+    /// <summary>
+    /// 模型显示倍率
+    /// </summary>
+    public decimal MultiplierShow { get; set; } = 1;
+
+    /// <summary>
+    /// 供应商分组名称(如：OpenAI、Anthropic、Google等)
+    /// </summary>
+    public string? ProviderName { get; set; }
+
+    /// <summary>
+    /// 模型图标URL
+    /// </summary>
+    public string? IconUrl { get; set; }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/OpenApi/TokenAggregateRoot.cs

@@ -5,27 +5,84 @@ using Volo.Abp.Domain.Entities.Auditing;
 namespace Yi.Framework.AiHub.Domain.Entities.OpenApi;
 
 [SugarTable("Ai_Token")]
+[SugarIndex($"index_{{table}}_{nameof(UserId)}", nameof(UserId), OrderByType.Asc)]
 public class TokenAggregateRoot : FullAuditedAggregateRoot<Guid>
 {
     public TokenAggregateRoot()
     {
     }
 
-    public TokenAggregateRoot(Guid userId)
+    public TokenAggregateRoot(Guid userId, string name)
     {
-        this.UserId = userId;
-        this.Token = GenerateToken();
+        UserId = userId;
+        Name = name;
+        Token = GenerateToken();
+        IsDisabled = false;
     }
 
+    /// <summary>
+    /// Token密钥
+    /// </summary>
     public string Token { get; set; }
+
+    /// <summary>
+    /// 用户Id
+    /// </summary>
     public Guid UserId { get; set; }
 
     /// <summary>
-    /// 重置token
+    /// 名称
     /// </summary>
-    public void ResetToken()
+    [SugarColumn(Length = 100)]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 过期时间（空为永不过期）
+    /// </summary>
+    public DateTime? ExpireTime { get; set; }
+
+    /// <summary>
+    /// 尊享包额度限制（空为不限制）
+    /// </summary>
+    public long? PremiumQuotaLimit { get; set; }
+
+    /// <summary>
+    /// 是否禁用
+    /// </summary>
+    public bool IsDisabled { get; set; }
+
+    /// <summary>
+    /// 检查Token是否可用
+    /// </summary>
+    public bool IsAvailable()
     {
-        this.Token = GenerateToken();
+        if (IsDisabled)
+        {
+            return false;
+        }
+
+        if (ExpireTime.HasValue && ExpireTime.Value < DateTime.Now)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    /// <summary>
+    /// 禁用Token
+    /// </summary>
+    public void Disable()
+    {
+        IsDisabled = true;
+    }
+
+    /// <summary>
+    /// 启用Token
+    /// </summary>
+    public void Enable()
+    {
+        IsDisabled = false;
     }
 
     private string GenerateToken(int length = 36)

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/PremiumPackageAggregateRoot.cs

@@ -76,23 +76,9 @@ public class PremiumPackageAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// <returns>是否消耗成功</returns>
     public bool ConsumeTokens(long tokenCount)
     {
-        if (RemainingTokens < tokenCount)
-        {
-            return false;
-        }
-
-        if (!IsActive)
-        {
-            return false;
-        }
-
-        if (ExpireDateTime.HasValue && ExpireDateTime.Value < DateTime.Now)
-        {
-            return false;
-        }
-
         RemainingTokens -= tokenCount;
         UsedTokens += tokenCount;
+        
         return true;
     }
 
@@ -100,14 +86,14 @@ public class PremiumPackageAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// 检查是否可用
     /// </summary>
     /// <returns>是否可用</returns>
-    public bool IsAvailable()
+    public bool IsAvailable(bool isVerifyRemainingToken=true)
     {
         if (!IsActive)
         {
             return false;
         }
 
-        if (RemainingTokens <= 0)
+        if (isVerifyRemainingToken&&RemainingTokens <= 0)
         {
             return false;
         }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Entities/UsageStatisticsAggregateRoot.cs

@@ -7,16 +7,22 @@ namespace Yi.Framework.AiHub.Domain.Entities;
 /// 用量统计
 /// </summary>
 [SugarTable("Ai_UsageStatistics")]
+[SugarIndex($"index_{{table}}_{nameof(UserId)}_{nameof(ModelId)}_{nameof(TokenId)}",
+    nameof(UserId), OrderByType.Asc,
+    nameof(ModelId), OrderByType.Asc,
+    nameof(TokenId), OrderByType.Asc
+)]
 public class UsageStatisticsAggregateRoot : FullAuditedAggregateRoot<Guid>
 {
     public UsageStatisticsAggregateRoot()
     {
     }
 
-    public UsageStatisticsAggregateRoot(Guid? userId, string modelId)
+    public UsageStatisticsAggregateRoot(Guid? userId, string modelId, Guid tokenId)
     {
         UserId = userId;
         ModelId = modelId;
+        TokenId = tokenId;
     }
 
     /// <summary>
@@ -29,6 +35,11 @@ public class UsageStatisticsAggregateRoot : FullAuditedAggregateRoot<Guid>
     /// </summary>
     public string ModelId { get; set; }
 
+    /// <summary>
+    /// Token密钥Id（通过API调用时记录，Web调用为Guid.Empty）
+    /// </summary>
+    public Guid TokenId { get; set; }
+
     /// <summary>
     /// 对话次数
     /// </summary>

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiGateWayManager.cs

@@ -7,16 +7,21 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using Volo.Abp.Domain.Services;
 using Yi.Framework.AiHub.Domain.AiGateWay;
 using Yi.Framework.AiHub.Domain.AiGateWay.Exceptions;
 using Yi.Framework.AiHub.Domain.Entities.Model;
+using Yi.Framework.AiHub.Domain.Shared.Consts;
 using Yi.Framework.AiHub.Domain.Shared.Dtos;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.Anthropic;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Embeddings;
 using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Images;
+using Yi.Framework.AiHub.Domain.Shared.Dtos.OpenAi.Responses;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
+using Yi.Framework.AiHub.Domain.Shared.Extensions;
 using Yi.Framework.Core.Extensions;
 using Yi.Framework.SqlSugarCore.Abstractions;
 using JsonSerializer = System.Text.Json.JsonSerializer;
@@ -27,21 +32,24 @@ namespace Yi.Framework.AiHub.Domain.Managers;
 public class AiGateWayManager : DomainService
 {
     private readonly ISqlSugarRepository<AiAppAggregateRoot> _aiAppRepository;
+    private readonly ISqlSugarRepository<AiModelEntity> _aiModelRepository;
     private readonly ILogger<AiGateWayManager> _logger;
     private readonly AiMessageManager _aiMessageManager;
     private readonly UsageStatisticsManager _usageStatisticsManager;
     private readonly ISpecialCompatible _specialCompatible;
     private PremiumPackageManager? _premiumPackageManager;
 
+
     public AiGateWayManager(ISqlSugarRepository<AiAppAggregateRoot> aiAppRepository, ILogger<AiGateWayManager> logger,
         AiMessageManager aiMessageManager, UsageStatisticsManager usageStatisticsManager,
-        ISpecialCompatible specialCompatible)
+        ISpecialCompatible specialCompatible, ISqlSugarRepository<AiModelEntity> aiModelRepository)
     {
         _aiAppRepository = aiAppRepository;
         _logger = logger;
         _aiMessageManager = aiMessageManager;
         _usageStatisticsManager = usageStatisticsManager;
         _specialCompatible = specialCompatible;
+        _aiModelRepository = aiModelRepository;
     }
 
     private PremiumPackageManager PremiumPackageManager =>
@@ -50,17 +58,17 @@ public class AiGateWayManager : DomainService
     /// <summary>
     /// 获取模型
     /// </summary>
+    /// <param name="modelApiType"></param>
     /// <param name="modelId"></param>
     /// <returns></returns>
-    private async Task<AiModelDescribe> GetModelAsync(string modelId)
+    private async Task<AiModelDescribe> GetModelAsync(ModelApiTypeEnum modelApiType, string modelId)
     {
-        var allApp = await _aiAppRepository._DbQueryable.Includes(x => x.AiModels).ToListAsync();
-        foreach (var app in allApp)
-        {
-            var model = app.AiModels.FirstOrDefault(x => x.ModelId == modelId);
-            if (model is not null)
-            {
-                return new AiModelDescribe
+        var aiModelDescribe = await _aiModelRepository._DbQueryable
+            .LeftJoin<AiAppAggregateRoot>((model, app) => model.AiAppId == app.Id)
+            .Where((model, app) => model.ModelId == modelId)
+            .Where((model, app) => model.ModelApiType == modelApiType)
+            .Select((model, app) =>
+                new AiModelDescribe
                 {
                     AppId = app.Id,
                     AppName = app.Name,
@@ -72,37 +80,19 @@ public class AiGateWayManager : DomainService
                     ModelName = model.Name,
                     Description = model.Description,
                     AppExtraUrl = app.ExtraUrl,
-                    ModelExtraInfo = model.ExtraInfo
-                };
-            }
-        }
-
-        throw new UserFriendlyException($"{modelId}模型当前版本不支持");
-    }
-
-
-    /// <summary>
-    /// 聊天完成-流式
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async IAsyncEnumerable<ThorChatCompletionsResponse> CompleteChatStreamAsync(
-        ThorChatCompletionsRequest request,
-        [EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        _specialCompatible.Compatible(request);
-        var modelDescribe = await GetModelAsync(request.Model);
-        var chatService =
-            LazyServiceProvider.GetRequiredKeyedService<IChatCompletionService>(modelDescribe.HandlerName);
-
-        await foreach (var result in chatService.CompleteChatStreamAsync(modelDescribe, request, cancellationToken))
+                    ModelExtraInfo = model.ExtraInfo,
+                    Multiplier = model.Multiplier
+                })
+            .FirstAsync();
+        if (aiModelDescribe is null)
         {
-            yield return result;
+            throw new UserFriendlyException($"【{modelId}】模型当前版本【{modelApiType}】格式不支持");
         }
+
+        return aiModelDescribe;
     }
 
-
+    
     /// <summary>
     /// 聊天完成-非流式
     /// </summary>
@@ -110,46 +100,61 @@ public class AiGateWayManager : DomainService
     /// <param name="request"></param>
     /// <param name="userId"></param>
     /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public async Task CompleteChatForStatisticsAsync(HttpContext httpContext,
         ThorChatCompletionsRequest request,
         Guid? userId = null,
         Guid? sessionId = null,
+        Guid? tokenId = null,
         CancellationToken cancellationToken = default)
     {
         _specialCompatible.Compatible(request);
         var response = httpContext.Response;
         // 设置响应头，声明是 json
         //response.ContentType = "application/json; charset=UTF-8";
-        var modelDescribe = await GetModelAsync(request.Model);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, request.Model);
         var chatService =
             LazyServiceProvider.GetRequiredKeyedService<IChatCompletionService>(modelDescribe.HandlerName);
         var data = await chatService.CompleteChatAsync(modelDescribe, request, cancellationToken);
+        data.SupplementalMultiplier(modelDescribe.Multiplier);
         if (userId is not null)
         {
             await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = request.Messages?.LastOrDefault().Content ?? string.Empty,
+                    Content = sessionId is null ? "不予存储" : request.Messages?.LastOrDefault().Content ?? string.Empty,
                     ModelId = request.Model,
                     TokenUsage = data.Usage,
-                });
+                }, tokenId);
 
             await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = data.Choices?.FirstOrDefault()?.Delta.Content,
+                    Content =
+                        sessionId is null ? "不予存储" : data.Choices?.FirstOrDefault()?.Delta.Content ?? string.Empty,
                     ModelId = request.Model,
                     TokenUsage = data.Usage
-                });
+                }, tokenId);
 
-            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.Usage);
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.Usage, tokenId);
+
+            // 扣减尊享token包用量
+            if (PremiumPackageConst.ModeIds.Contains(request.Model))
+            {
+                var totalTokens = data.Usage?.TotalTokens ?? 0;
+                if (totalTokens > 0)
+                {
+                    await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                }
+            }
         }
 
         await response.WriteAsJsonAsync(data, cancellationToken);
     }
 
+    
     /// <summary>
     /// 聊天完成-缓存处理
     /// </summary>
@@ -157,6 +162,7 @@ public class AiGateWayManager : DomainService
     /// <param name="request"></param>
     /// <param name="userId"></param>
     /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public async Task CompleteChatStreamForStatisticsAsync(
@@ -164,6 +170,7 @@ public class AiGateWayManager : DomainService
         ThorChatCompletionsRequest request,
         Guid? userId = null,
         Guid? sessionId = null,
+        Guid? tokenId = null,
         CancellationToken cancellationToken = default)
     {
         var response = httpContext.Response;
@@ -173,8 +180,12 @@ public class AiGateWayManager : DomainService
         response.Headers.TryAdd("Connection", "keep-alive");
 
 
-        var gateWay = LazyServiceProvider.GetRequiredService<AiGateWayManager>();
-        var completeChatResponse = gateWay.CompleteChatStreamAsync(request, cancellationToken);
+        _specialCompatible.Compatible(request);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IChatCompletionService>(modelDescribe.HandlerName);
+        
+        var completeChatResponse = chatService.CompleteChatStreamAsync(modelDescribe,request, cancellationToken);
         var tokenUsage = new ThorUsageResponse();
 
         //缓存队列算法
@@ -216,7 +227,8 @@ public class AiGateWayManager : DomainService
         {
             await foreach (var data in completeChatResponse)
             {
-                if (data.Usage is not null)
+                data.SupplementalMultiplier(modelDescribe.Multiplier);
+                if (data.Usage is not null && (data.Usage.CompletionTokens > 0 || data.Usage.OutputTokens > 0))
                 {
                     tokenUsage = data.Usage;
                 }
@@ -230,7 +242,7 @@ public class AiGateWayManager : DomainService
         catch (Exception e)
         {
             _logger.LogError(e, $"Ai对话异常");
-            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             var model = new ThorChatCompletionsResponse()
             {
                 Choices = new List<ThorChatChoiceResponse>()
@@ -263,23 +275,33 @@ public class AiGateWayManager : DomainService
         await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = request.Messages?.LastOrDefault()?.Content ?? string.Empty,
+                Content = sessionId is null ? "不予存储" : request.Messages?.LastOrDefault()?.MessagesStore ?? string.Empty,
                 ModelId = request.Model,
                 TokenUsage = tokenUsage,
-            });
+            }, tokenId);
 
         await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = backupSystemContent.ToString(),
+                Content = sessionId is null ? "不予存储" : backupSystemContent.ToString(),
                 ModelId = request.Model,
                 TokenUsage = tokenUsage
-            });
+            }, tokenId);
 
-        await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage);
+        await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage, tokenId);
+
+        // 扣减尊享token包用量
+        if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model))
+        {
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (totalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
     }
-
-
+    
+    
     /// <summary>
     /// 图片生成
     /// </summary>
@@ -287,17 +309,18 @@ public class AiGateWayManager : DomainService
     /// <param name="userId"></param>
     /// <param name="sessionId"></param>
     /// <param name="request"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <exception cref="BusinessException"></exception>
     /// <exception cref="Exception"></exception>
     public async Task CreateImageForStatisticsAsync(HttpContext context, Guid? userId, Guid? sessionId,
-        ImageCreateRequest request)
+        ImageCreateRequest request, Guid? tokenId = null)
     {
         try
         {
             var model = request.Model;
             if (string.IsNullOrEmpty(model)) model = "dall-e-2";
 
-            var modelDescribe = await GetModelAsync(model);
+            var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, model);
 
             // 获取渠道指定的实现类型的服务
             var imageService =
@@ -315,40 +338,51 @@ public class AiGateWayManager : DomainService
             await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
                 new MessageInputDto
                 {
-                    Content = request.Prompt,
+                    Content = sessionId is null ? "不予存储" : request.Prompt,
                     ModelId = model,
                     TokenUsage = response.Usage,
-                });
+                }, tokenId);
 
             await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
                 new MessageInputDto
                 {
-                    Content = response.Results?.FirstOrDefault()?.Url,
+                    Content = sessionId is null ? "不予存储" : response.Results?.FirstOrDefault()?.Url,
                     ModelId = model,
                     TokenUsage = response.Usage
-                });
+                }, tokenId);
 
-            await _usageStatisticsManager.SetUsageAsync(userId, model, response.Usage);
+            await _usageStatisticsManager.SetUsageAsync(userId, model, response.Usage, tokenId);
+
+            // 扣减尊享token包用量
+            if (userId is not null && PremiumPackageConst.ModeIds.Contains(request.Model))
+            {
+                var totalTokens = response.Usage.TotalTokens ?? 0;
+                if (totalTokens > 0)
+                {
+                    await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+                }
+            }
         }
         catch (Exception e)
         {
-            var errorContent = $"图片生成Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"图片生成Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
         }
     }
-
-
+    
+    
     /// <summary>
     /// 向量生成
     /// </summary>
     /// <param name="context"></param>
+    /// <param name="userId"></param>
     /// <param name="sessionId"></param>
     /// <param name="input"></param>
-    /// <param name="userId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <exception cref="Exception"></exception>
     /// <exception cref="BusinessException"></exception>
     public async Task EmbeddingForStatisticsAsync(HttpContext context, Guid? userId, Guid? sessionId,
-        ThorEmbeddingInput input)
+        ThorEmbeddingInput input, Guid? tokenId = null)
     {
         try
         {
@@ -357,7 +391,7 @@ public class AiGateWayManager : DomainService
             using var embedding =
                 Activity.Current?.Source.StartActivity("向量模型调用");
 
-            var modelDescribe = await GetModelAsync(input.Model);
+            var modelDescribe = await GetModelAsync(ModelApiTypeEnum.OpenAi, input.Model);
 
             // 获取渠道指定的实现类型的服务
             var embeddingService =
@@ -432,7 +466,7 @@ public class AiGateWayManager : DomainService
             //         TokenUsage = usage
             //     });
 
-            await _usageStatisticsManager.SetUsageAsync(userId, input.Model, usage);
+            await _usageStatisticsManager.SetUsageAsync(userId, input.Model, usage, tokenId);
         }
         catch (ThorRateLimitException)
         {
@@ -444,33 +478,11 @@ public class AiGateWayManager : DomainService
         }
         catch (Exception e)
         {
-            var errorContent = $"嵌入Ai异常，异常信息：\n当前Ai模型：{input.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"嵌入Ai异常，异常信息：\n当前Ai模型：{input.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
         }
     }
-
-
-    /// <summary>
-    /// Anthropic聊天完成-流式
-    /// </summary>
-    /// <param name="request"></param>
-    /// <param name="cancellationToken"></param>
-    /// <returns></returns>
-    public async IAsyncEnumerable<(string, AnthropicStreamDto?)> AnthropicCompleteChatStreamAsync(
-        AnthropicInput request,
-        [EnumeratorCancellation] CancellationToken cancellationToken)
-    {
-        _specialCompatible.AnthropicCompatible(request);
-        var modelDescribe = await GetModelAsync(request.Model);
-        var chatService =
-            LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
-
-        await foreach (var result in chatService.StreamChatCompletionsAsync(modelDescribe, request, cancellationToken))
-        {
-            yield return result;
-        }
-    }
-
+    
 
     /// <summary>
     /// Anthropic聊天完成-非流式
@@ -479,57 +491,59 @@ public class AiGateWayManager : DomainService
     /// <param name="request"></param>
     /// <param name="userId"></param>
     /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public async Task AnthropicCompleteChatForStatisticsAsync(HttpContext httpContext,
         AnthropicInput request,
         Guid? userId = null,
         Guid? sessionId = null,
+        Guid? tokenId = null,
         CancellationToken cancellationToken = default)
     {
         _specialCompatible.AnthropicCompatible(request);
         var response = httpContext.Response;
         // 设置响应头，声明是 json
         //response.ContentType = "application/json; charset=UTF-8";
-        var modelDescribe = await GetModelAsync(request.Model);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Claude, request.Model);
         var chatService =
             LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
         var data = await chatService.ChatCompletionsAsync(modelDescribe, request, cancellationToken);
+
+        data.SupplementalMultiplier(modelDescribe.Multiplier);
+
         if (userId is not null)
         {
             await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = request.Messages?.FirstOrDefault()?.Content ?? string.Empty,
+                    Content = "不予存储",
                     ModelId = request.Model,
                     TokenUsage = data.TokenUsage,
-                });
+                }, tokenId);
 
             await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
                 new MessageInputDto
                 {
-                    Content = data.content?.FirstOrDefault()?.text,
+                    Content = "不予存储",
                     ModelId = request.Model,
                     TokenUsage = data.TokenUsage
-                });
+                }, tokenId);
 
-            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.TokenUsage);
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, data.TokenUsage, tokenId);
 
             // 扣减尊享token包用量
-            var totalTokens = (data.TokenUsage?.InputTokens ?? 0) + (data.TokenUsage?.OutputTokens ?? 0);
+            var totalTokens = data.TokenUsage.TotalTokens ?? 0;
             if (totalTokens > 0)
             {
-                var consumeSuccess = await PremiumPackageManager.ConsumeTokensAsync(userId.Value, totalTokens);
-                if (!consumeSuccess)
-                {
-                    _logger.LogWarning($"用户 {userId.Value} 尊享token包扣减失败，消耗token数: {totalTokens}");
-                }
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
             }
         }
 
         await response.WriteAsJsonAsync(data, cancellationToken);
     }
 
+    
     /// <summary>
     /// Anthropic聊天完成-缓存处理
     /// </summary>
@@ -537,6 +551,7 @@ public class AiGateWayManager : DomainService
     /// <param name="request"></param>
     /// <param name="userId"></param>
     /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
     /// <param name="cancellationToken"></param>
     /// <returns></returns>
     public async Task AnthropicCompleteChatStreamForStatisticsAsync(
@@ -544,6 +559,7 @@ public class AiGateWayManager : DomainService
         AnthropicInput request,
         Guid? userId = null,
         Guid? sessionId = null,
+        Guid? tokenId = null,
         CancellationToken cancellationToken = default)
     {
         var response = httpContext.Response;
@@ -551,21 +567,26 @@ public class AiGateWayManager : DomainService
         response.ContentType = "text/event-stream;charset=utf-8;";
         response.Headers.TryAdd("Cache-Control", "no-cache");
         response.Headers.TryAdd("Connection", "keep-alive");
-
-
-        var gateWay = LazyServiceProvider.GetRequiredService<AiGateWayManager>();
-        var completeChatResponse = gateWay.AnthropicCompleteChatStreamAsync(request, cancellationToken);
+        
+        _specialCompatible.AnthropicCompatible(request);
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Claude, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IAnthropicChatCompletionService>(modelDescribe.HandlerName);
+        
+        var completeChatResponse = chatService.StreamChatCompletionsAsync(modelDescribe,request, cancellationToken);
         ThorUsageResponse? tokenUsage = null;
         StringBuilder backupSystemContent = new StringBuilder();
         try
         {
             await foreach (var responseResult in completeChatResponse)
             {
+                responseResult.Item2.SupplementalMultiplier(modelDescribe.Multiplier);
                 //message_start是为了保底机制
-                if (responseResult.Item1.Contains("message_delta")||responseResult.Item1.Contains("message_start"))
+                if (responseResult.Item1.Contains("message_delta") || responseResult.Item1.Contains("message_start"))
                 {
                     tokenUsage = responseResult.Item2?.TokenUsage;
                 }
+
                 backupSystemContent.Append(responseResult.Item2?.Delta?.Text);
                 await WriteAsEventStreamDataAsync(httpContext, responseResult.Item1, responseResult.Item2,
                     cancellationToken);
@@ -574,67 +595,200 @@ public class AiGateWayManager : DomainService
         catch (Exception e)
         {
             _logger.LogError(e, $"Ai对话异常");
-            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈:{e}";
+            var errorContent = $"对话Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
             throw new UserFriendlyException(errorContent);
-            // var model = new AnthropicStreamDto
-            // {
-            //     Message = new AnthropicChatCompletionDto
-            //     {
-            //         content =
-            //         [
-            //             new AnthropicChatCompletionDtoContent
-            //             {
-            //                 text = errorContent,
-            //             }
-            //         ],
-            //     },
-            //     Error = new AnthropicStreamErrorDto
-            //     {
-            //         Type = null,
-            //         Message = errorContent
-            //     }
-            // };
-            // var message = JsonConvert.SerializeObject(model, new JsonSerializerSettings
-            // {
-            //     ContractResolver = new CamelCasePropertyNamesContractResolver()
-            // });
-            // await response.WriteAsJsonAsync(message, ThorJsonSerializer.DefaultOptions);
         }
 
         await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = request.Messages?.LastOrDefault()?.Content ?? string.Empty,
+                Content = "不予存储",
                 ModelId = request.Model,
                 TokenUsage = tokenUsage,
-            });
+            }, tokenId);
 
         await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
             new MessageInputDto
             {
-                Content = backupSystemContent.ToString(),
+                Content = "不予存储",
                 ModelId = request.Model,
                 TokenUsage = tokenUsage
-            });
+            }, tokenId);
 
-        await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage);
+        await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage, tokenId);
 
         // 扣减尊享token包用量
         if (userId.HasValue && tokenUsage is not null)
         {
-            var totalTokens = tokenUsage.TotalTokens??0;
-            if (totalTokens > 0)
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (tokenUsage.TotalTokens > 0)
             {
-                var consumeSuccess = await PremiumPackageManager.ConsumeTokensAsync(userId.Value, totalTokens);
-                if (!consumeSuccess)
-                {
-                    _logger.LogWarning($"用户 {userId.Value} 尊享token包扣减失败，消耗token数: {totalTokens}");
-                }
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
             }
         }
     }
 
-    #region Anthropic格式Http响应
+
+    /// <summary>
+    /// OpenAi 响应-非流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId"></param>
+    /// <param name="cancellationToken"></param>
+    public async Task OpenAiResponsesAsyncForStatisticsAsync(HttpContext httpContext,
+        OpenAiResponsesInput request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        // _specialCompatible.AnthropicCompatible(request);
+        var response = httpContext.Response;
+        // 设置响应头，声明是 json
+        //response.ContentType = "application/json; charset=UTF-8";
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Response, request.Model);
+
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IOpenAiResponseService>(modelDescribe.HandlerName);
+        var data = await chatService.ResponsesAsync(modelDescribe, request, cancellationToken);
+        
+        data.SupplementalMultiplier(modelDescribe.Multiplier);
+        
+        var tokenUsage= new ThorUsageResponse
+        {
+            InputTokens = data.Usage.InputTokens,
+            OutputTokens = data.Usage.OutputTokens,
+            TotalTokens = data.Usage.InputTokens + data.Usage.OutputTokens,
+        };
+        if (userId is not null)
+        {
+            await _aiMessageManager.CreateUserMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = request.Model,
+                    TokenUsage = tokenUsage,
+                }, tokenId);
+        
+            await _aiMessageManager.CreateSystemMessageAsync(userId.Value, sessionId,
+                new MessageInputDto
+                {
+                    Content = "不予存储",
+                    ModelId = request.Model,
+                    TokenUsage = tokenUsage
+                }, tokenId);
+        
+            await _usageStatisticsManager.SetUsageAsync(userId.Value, request.Model, tokenUsage, tokenId);
+        
+            // 扣减尊享token包用量
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (totalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+
+        await response.WriteAsJsonAsync(data, cancellationToken);
+    }
+    
+    
+    /// <summary>
+    /// OpenAi响应-流式-缓存处理
+    /// </summary>
+    /// <param name="httpContext"></param>
+    /// <param name="request"></param>
+    /// <param name="userId"></param>
+    /// <param name="sessionId"></param>
+    /// <param name="tokenId">Token Id（Web端传null或Guid.Empty）</param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    public async Task OpenAiResponsesStreamForStatisticsAsync(
+        HttpContext httpContext,
+        OpenAiResponsesInput request,
+        Guid? userId = null,
+        Guid? sessionId = null,
+        Guid? tokenId = null,
+        CancellationToken cancellationToken = default)
+    {
+        var response = httpContext.Response;
+        // 设置响应头，声明是 SSE 流
+        response.ContentType = "text/event-stream;charset=utf-8;";
+        response.Headers.TryAdd("Cache-Control", "no-cache");
+        response.Headers.TryAdd("Connection", "keep-alive");
+        
+        var modelDescribe = await GetModelAsync(ModelApiTypeEnum.Response, request.Model);
+        var chatService =
+            LazyServiceProvider.GetRequiredKeyedService<IOpenAiResponseService>(modelDescribe.HandlerName);
+        
+        var completeChatResponse = chatService.ResponsesStreamAsync(modelDescribe,request, cancellationToken);
+        ThorUsageResponse? tokenUsage = null;
+        try
+        {
+            await foreach (var responseResult in completeChatResponse)
+            {
+                //message_start是为了保底机制
+                if (responseResult.Item1.Contains("response.completed"))
+                {
+                    var obj = responseResult.Item2!.Value;
+                    int inputTokens = obj.GetPath("response","usage","input_tokens").GetInt();
+                    int outputTokens = obj.GetPath("response","usage","output_tokens").GetInt();
+                    inputTokens=Convert.ToInt32(inputTokens * modelDescribe.Multiplier);
+                    outputTokens=Convert.ToInt32(outputTokens * modelDescribe.Multiplier);
+                    tokenUsage = new ThorUsageResponse
+                    {
+                        PromptTokens =inputTokens,
+                        InputTokens = inputTokens,
+                        OutputTokens = outputTokens,
+                        CompletionTokens = outputTokens,
+                        TotalTokens = inputTokens+outputTokens,
+                    };
+                }
+                
+                await WriteAsEventStreamDataAsync(httpContext, responseResult.Item1, responseResult.Item2,
+                    cancellationToken);
+            }
+        }
+        catch (Exception e)
+        {
+            _logger.LogError(e, $"Ai响应异常");
+            var errorContent = $"响应Ai异常，异常信息：\n当前Ai模型：{request.Model}\n异常信息：{e.Message}\n异常堆栈：{e}";
+            throw new UserFriendlyException(errorContent);
+        }
+
+        await _aiMessageManager.CreateUserMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储" ,
+                ModelId = request.Model,
+                TokenUsage = tokenUsage,
+            }, tokenId);
+
+        await _aiMessageManager.CreateSystemMessageAsync(userId, sessionId,
+            new MessageInputDto
+            {
+                Content = "不予存储" ,
+                ModelId = request.Model,
+                TokenUsage = tokenUsage
+            }, tokenId);
+
+        await _usageStatisticsManager.SetUsageAsync(userId, request.Model, tokenUsage, tokenId);
+
+        // 扣减尊享token包用量
+        if (userId.HasValue && tokenUsage is not null)
+        {
+            var totalTokens = tokenUsage.TotalTokens ?? 0;
+            if (tokenUsage.TotalTokens > 0)
+            {
+                await PremiumPackageManager.TryConsumeTokensAsync(userId.Value, totalTokens);
+            }
+        }
+    }
+    
+
+    #region 流式传输格式Http响应
 
     private static readonly byte[] EventPrefix = "event: "u8.ToArray();
     private static readonly byte[] DataPrefix = "data: "u8.ToArray();
@@ -649,7 +803,6 @@ public class AiGateWayManager : DomainService
         string @event,
         T value,
         CancellationToken cancellationToken = default)
-        where T : class
     {
         var response = context.Response;
         var bodyStream = response.Body;

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiMessageManager.cs

@@ -19,28 +19,30 @@ public class AiMessageManager : DomainService
     /// <summary>
     /// 创建系统消息
     /// </summary>
-    /// <param name="sessionId"></param>
-    /// <param name="userId"></param>
-    /// <param name="input"></param>
+    /// <param name="userId">用户Id</param>
+    /// <param name="sessionId">会话Id</param>
+    /// <param name="input">消息输入</param>
+    /// <param name="tokenId">Token Id（Web端传Guid.Empty）</param>
     /// <returns></returns>
-    public async Task CreateSystemMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input)
+    public async Task CreateSystemMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null)
     {
         input.Role = "system";
-        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId,input.TokenUsage);
+        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId, input.TokenUsage, tokenId);
         await _repository.InsertAsync(message);
     }
-    
+
     /// <summary>
-    /// 创建系统消息
+    /// 创建用户消息
     /// </summary>
-    /// <param name="sessionId"></param>
-    /// <param name="userId"></param>
-    /// <param name="input"></param>
+    /// <param name="userId">用户Id</param>
+    /// <param name="sessionId">会话Id</param>
+    /// <param name="input">消息输入</param>
+    /// <param name="tokenId">Token Id（Web端传Guid.Empty）</param>
     /// <returns></returns>
-    public async Task CreateUserMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input)
+    public async Task CreateUserMessageAsync(Guid? userId, Guid? sessionId, MessageInputDto input, Guid? tokenId = null)
     {
         input.Role = "user";
-        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId,input.TokenUsage);
+        var message = new MessageAggregateRoot(userId, sessionId, input.Content, input.Role, input.ModelId, input.TokenUsage, tokenId);
         await _repository.InsertAsync(message);
     }
 }

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/AiRechargeManager.cs

@@ -2,6 +2,7 @@
 using Volo.Abp.Domain.Services;
 using Yi.Framework.AiHub.Domain.Entities;
 using Yi.Framework.AiHub.Domain.Entities.OpenApi;
+using Yi.Framework.AiHub.Domain.Shared.Enums;
 using Yi.Framework.SqlSugarCore.Abstractions;
 
 namespace Yi.Framework.AiHub.Domain.Managers;
@@ -28,7 +29,7 @@ public class AiRechargeManager : DomainService
         var currentTime = DateTime.Now;
 
         // 查找所有充值记录，按用户分组
-        var allRecharges = await _rechargeRepository._DbQueryable
+        var allRecharges = await _rechargeRepository._DbQueryable.Where(x => x.RechargeType == RechargeTypeEnum.Vip)
             .ToListAsync();
 
         if (!allRecharges.Any())
@@ -48,7 +49,7 @@ public class AiRechargeManager : DomainService
 
                 // 找到用户最大的过期时间
                 var maxExpireTime = group.Max(x => x.ExpireDateTime);
-                
+
                 // 如果最大过期时间小于当前时间，说明用户已过期(比较日期，满足用户最后一天)
                 return maxExpireTime.HasValue && maxExpireTime.Value.Date < currentTime.Date;
             })

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/CardFlipManager.cs

@@ -0,0 +1,356 @@
+using Microsoft.Extensions.Logging;
+using Volo.Abp.Domain.Services;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Domain.Managers;
+
+/// <summary>
+/// 翻牌管理器 - 负责翻牌核心业务逻辑
+/// </summary>
+public class CardFlipManager : DomainService
+{
+    private readonly ISqlSugarRepository<CardFlipTaskAggregateRoot> _cardFlipTaskRepository;
+    private readonly ISqlSugarRepository<InvitationRecordAggregateRoot> _invitationRecordRepository;
+    private readonly InviteCodeManager _inviteCodeManager;
+    private readonly ILogger<CardFlipManager> _logger;
+
+    // 翻牌规则配置
+    public const int MAX_FREE_FLIPS = 7;        // 免费翻牌次数
+    public const int MAX_INVITE_FLIPS = 3;      // 邀请解锁翻牌次数
+    public const int TOTAL_MAX_FLIPS = 10;      // 总最大翻牌次数
+
+    private const int EIGHTH_FLIP = 8;           // 第8次翻牌
+    private const int NINTH_FLIP = 9;            // 第9次翻牌
+    private const int TENTH_FLIP = 10;           // 第10次翻牌
+
+    // 前7次免费翻牌奖励配置
+    private const long FREE_MIN_REWARD = 10000;       // 前7次最小奖励 1w
+    private const long FREE_MAX_REWARD = 30000;       // 前7次最大奖励 3w
+    private const double FREE_WIN_RATE = 0.5;         // 前7次中奖概率 50%
+
+    private const long EIGHTH_MIN_REWARD = 1000000;   // 第8次最小奖励 100w
+    private const long EIGHTH_MAX_REWARD = 3000000;   // 第8次最大奖励 300w
+    private const long NINTH_MIN_REWARD = 1000000;    // 第9次最小奖励 100w
+    private const long NINTH_MAX_REWARD = 5000000;    // 第9次最大奖励 500w
+    private const long TENTH_MIN_REWARD = 1000000;    // 第10次最小奖励 100w
+    private const long TENTH_MAX_REWARD = 10000000;   // 第10次最大奖励 1000w
+
+    public CardFlipManager(
+        ISqlSugarRepository<CardFlipTaskAggregateRoot> cardFlipTaskRepository,
+        ISqlSugarRepository<InvitationRecordAggregateRoot> invitationRecordRepository,
+        InviteCodeManager inviteCodeManager,
+        ILogger<CardFlipManager> logger)
+    {
+        _cardFlipTaskRepository = cardFlipTaskRepository;
+        _invitationRecordRepository = invitationRecordRepository;
+        _inviteCodeManager = inviteCodeManager;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// 获取或创建本周任务
+    /// </summary>
+    public async Task<CardFlipTaskAggregateRoot?> GetOrCreateWeeklyTaskAsync(
+        Guid userId,
+        DateTime weekStart,
+        bool createIfNotExists)
+    {
+        var task = await _cardFlipTaskRepository._DbQueryable
+            .Where(x => x.UserId == userId && x.WeekStartDate == weekStart)
+            .FirstAsync();
+
+        if (task == null && createIfNotExists)
+        {
+            task = new CardFlipTaskAggregateRoot(userId, weekStart);
+            await _cardFlipTaskRepository.InsertAsync(task);
+        }
+
+        return task;
+    }
+
+    /// <summary>
+    /// 获取已翻牌的顺序列表
+    /// </summary>
+    public List<int> GetFlippedOrder(CardFlipTaskAggregateRoot task)
+    {
+        return task.FlippedOrder ?? new List<int>();
+    }
+
+    /// <summary>
+    /// 执行翻牌逻辑
+    /// </summary>
+    /// <param name="userId">用户ID</param>
+    /// <param name="flipNumber">翻牌序号</param>
+    /// <param name="weekStart">本周开始日期</param>
+    /// <returns>翻牌结果</returns>
+    public async Task<FlipResult> ExecuteFlipAsync(Guid userId, int flipNumber, DateTime weekStart)
+    {
+        // 验证翻牌序号
+        if (flipNumber < 1 || flipNumber > TOTAL_MAX_FLIPS)
+        {
+            throw new UserFriendlyException($"翻牌序号必须在1-{TOTAL_MAX_FLIPS}之间");
+        }
+
+        // 获取或创建本周任务
+        var task = await GetOrCreateWeeklyTaskAsync(userId, weekStart, createIfNotExists: true);
+
+        // 验证翻牌次数
+        if (task.TotalFlips >= TOTAL_MAX_FLIPS)
+        {
+            throw new UserFriendlyException("本周翻牌次数已用完,请下周再来!");
+        }
+
+        // 验证该牌是否已经翻过
+        var flippedOrder = GetFlippedOrder(task);
+        if (flippedOrder.Contains(flipNumber))
+        {
+            throw new UserFriendlyException($"第 {flipNumber} 号牌已经翻过了!");
+        }
+
+        // 判断翻牌类型
+        var flipType = DetermineFlipType(task);
+
+        // 验证是否有足够的次数
+        if (!CanUseFlipType(task, flipType))
+        {
+            throw new UserFriendlyException(GetFlipTypeErrorMessage(flipType));
+        }
+
+        // 如果是邀请类型翻牌，必须验证用户本周的邀请记录数量足够（包括填写别人的邀请码和别人填写我的邀请码）
+        if (flipType == FlipType.Invite)
+        {
+            // 查询本周作为邀请人或被邀请人的记录数量（双方都会增加翻牌次数）
+            var weeklyInviteRecordCount = await _invitationRecordRepository._DbQueryable
+                .Where(x => x.InviterId == userId || x.InvitedUserId == userId)
+                .Where(x => x.InvitationTime >= weekStart)
+                .CountAsync();
+
+            // 本周邀请记录数量必须 >= 即将使用的邀请翻牌次数
+            // 例如: 要翻第8次(InviteFlipsUsed=0->1), 需要至少有1条邀请记录（我邀请别人或别人邀请我）
+            //      要翻第9次(InviteFlipsUsed=1->2), 需要至少有2条邀请记录
+            //      要翻第10次(InviteFlipsUsed=2->3), 需要至少有3条邀请记录
+            var requiredInviteRecordCount = task.InviteFlipsUsed + 1;
+            if (weeklyInviteRecordCount < requiredInviteRecordCount)
+            {
+                throw new UserFriendlyException($"需本周累积{requiredInviteRecordCount}次邀请记录（填写别人的邀请码或别人填写你的邀请码）才能解锁第{task.TotalFlips + 1}次翻牌");
+            }
+        }
+
+        // 计算翻牌结果（基于当前是第几次翻牌，而不是卡片序号）
+        var flipCount = task.TotalFlips + 1; // 当前这次翻牌是第几次
+        var result = CalculateFlipResult(flipCount);
+
+        // 将卡片序号信息也返回
+        result.FlipNumber = flipNumber;
+
+        // 更新翻牌次数（必须在记录奖励之前，因为需要先确定是第几次）
+        task.IncrementFlip(flipType);
+
+        // 记录翻牌顺序
+        if (task.FlippedOrder == null)
+        {
+            task.FlippedOrder = new List<int>();
+        }
+        task.FlippedOrder.Add(flipNumber);
+
+        // 如果中奖，记录奖励金额（用于后续查询显示）
+        if (result.IsWin)
+        {
+            task.SetWinReward(flipCount, result.RewardAmount);
+        }
+
+        await _cardFlipTaskRepository.UpdateAsync(task);
+
+        _logger.LogInformation($"用户 {userId} 完成第 {flipNumber} 次翻牌,中奖:{result.IsWin}");
+
+        return result;
+    }
+
+    /// <summary>
+    /// 判断是否可以翻牌
+    /// </summary>
+    public bool CanFlipCard(CardFlipTaskAggregateRoot? task)
+    {
+        if (task == null) return true; // 没有任务记录,可以开始翻牌
+
+        return task.TotalFlips < TOTAL_MAX_FLIPS;
+    }
+
+    /// <summary>
+    /// 判断翻牌类型
+    /// </summary>
+    public FlipType DetermineFlipType(CardFlipTaskAggregateRoot task)
+    {
+        if (task.FreeFlipsUsed < MAX_FREE_FLIPS)
+        {
+            return FlipType.Free;
+        }
+        else
+        {
+            return FlipType.Invite;
+        }
+    }
+
+    /// <summary>
+    /// 判断是否可以使用该翻牌类型
+    /// </summary>
+    public bool CanUseFlipType(CardFlipTaskAggregateRoot task, FlipType flipType)
+    {
+        return flipType switch
+        {
+            FlipType.Free => task.FreeFlipsUsed < MAX_FREE_FLIPS,
+            FlipType.Invite => task.InviteFlipsUsed < MAX_INVITE_FLIPS,
+            _ => false
+        };
+    }
+
+    /// <summary>
+    /// 计算翻牌结果
+    /// </summary>
+    /// <param name="flipCount">第几次翻牌（1-10）</param>
+    private FlipResult CalculateFlipResult(int flipCount)
+    {
+        var result = new FlipResult
+        {
+            FlipNumber = 0, // 稍后会被设置为实际的卡片序号
+            IsWin = false
+        };
+
+        var random = new Random();
+
+        // 前7次: 50%概率中奖，奖励1w-3w
+        if (flipCount <= 7)
+        {
+            // 50%概率中奖
+            if (random.NextDouble() < FREE_WIN_RATE)
+            {
+                var rewardAmount = GenerateRandomReward(FREE_MIN_REWARD, FREE_MAX_REWARD);
+                result.IsWin = true;
+                result.RewardAmount = rewardAmount;
+                result.RewardDesc = $"恭喜获得尊享包 {rewardAmount / 10000m:0.##}w tokens!";
+            }
+            else
+            {
+                result.IsWin = false;
+                result.RewardDesc = "很遗憾,未中奖";
+            }
+        }
+        // 第8次中奖 (邀请码解锁)
+        else if (flipCount == EIGHTH_FLIP)
+        {
+            var rewardAmount = GenerateRandomReward(EIGHTH_MIN_REWARD, EIGHTH_MAX_REWARD);
+            result.IsWin = true;
+            result.RewardAmount = rewardAmount;
+            result.RewardDesc = $"恭喜获得尊享包 {rewardAmount / 10000}w tokens!";
+        }
+        // 第9次中奖 (邀请码解锁)
+        else if (flipCount == NINTH_FLIP)
+        {
+            var rewardAmount = GenerateRandomReward(NINTH_MIN_REWARD, NINTH_MAX_REWARD);
+            result.IsWin = true;
+            result.RewardAmount = rewardAmount;
+            result.RewardDesc = $"恭喜获得尊享包 {rewardAmount / 10000}w tokens!";
+        }
+        // 第10次中奖 (邀请码解锁)
+        else if (flipCount == TENTH_FLIP)
+        {
+            var rewardAmount = GenerateRandomReward(TENTH_MIN_REWARD, TENTH_MAX_REWARD);
+            result.IsWin = true;
+            result.RewardAmount = rewardAmount;
+            result.RewardDesc = $"恭喜获得尊享包 {rewardAmount / 10000}w tokens!";
+        }
+
+        return result;
+    }
+
+    /// <summary>
+    /// 获取翻牌类型错误提示
+    /// </summary>
+    private string GetFlipTypeErrorMessage(FlipType flipType)
+    {
+        return flipType switch
+        {
+            FlipType.Free => "免费翻牌次数已用完",
+            FlipType.Invite => "需要使用邀请码解锁更多次数",
+            _ => "无法翻牌"
+        };
+    }
+
+    /// <summary>
+    /// 生成随机奖励金额
+    /// </summary>
+    private long GenerateRandomReward(long min, long max)
+    {
+        var random = new Random();
+
+        // 根据最小值判断单位
+        // 如果min小于100000，则使用1w(10000)作为单位；否则使用100w(1000000)作为单位
+        long unit = min < 100000 ? 10000 : 1000000;
+
+        // 将min和max转换为单位的倍数
+        long minUnits = min / unit;
+        long maxUnits = max / unit;
+
+        // 在倍数范围内随机
+        long randomUnits = random.Next((int)minUnits, (int)maxUnits + 1);
+
+        // 返回单位的倍数
+        return randomUnits * unit;
+    }
+
+    /// <summary>
+    /// 获取本周开始日期(周一)
+    /// </summary>
+    public static DateTime GetWeekStartDate(DateTime date)
+    {
+        var dayOfWeek = (int)date.DayOfWeek;
+        // 将周日(0)转换为7
+        if (dayOfWeek == 0) dayOfWeek = 7;
+
+        // 计算本周一的日期
+        var monday = date.Date.AddDays(-(dayOfWeek - 1));
+        return monday;
+    }
+
+    /// <summary>
+    /// 获取翻牌类型描述
+    /// </summary>
+    public static string GetFlipTypeDesc(int flipNumber)
+    {
+        if (flipNumber <= MAX_FREE_FLIPS)
+        {
+            return "免费";
+        }
+        else
+        {
+            return "邀请解锁";
+        }
+    }
+}
+
+/// <summary>
+/// 翻牌结果
+/// </summary>
+public class FlipResult
+{
+    /// <summary>
+    /// 翻牌序号
+    /// </summary>
+    public int FlipNumber { get; set; }
+
+    /// <summary>
+    /// 是否中奖
+    /// </summary>
+    public bool IsWin { get; set; }
+
+    /// <summary>
+    /// 奖励金额
+    /// </summary>
+    public long RewardAmount { get; set; }
+
+    /// <summary>
+    /// 奖励描述
+    /// </summary>
+    public string RewardDesc { get; set; } = string.Empty;
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/Fuwuhao/FuwuhaoManager.cs

@@ -19,6 +19,7 @@ public class FuwuhaoManager : DomainService
     private IDistributedCache<AccessTokenResponse> _accessTokenCache;
     private ISqlSugarRepository<AiUserExtraInfoEntity> _userRepository;
     private readonly ILogger<FuwuhaoManager> _logger;
+
     public FuwuhaoManager(IOptions<FuwuhaoOptions> options, IHttpClientFactory httpClientFactory,
         ISqlSugarRepository<AiUserExtraInfoEntity> userRepository,
         IDistributedCache<AccessTokenResponse> accessTokenCache, ILogger<FuwuhaoManager> logger)
@@ -49,6 +50,11 @@ public class FuwuhaoManager : DomainService
             {
                 PropertyNamingPolicy = JsonNamingPolicy.SnakeCaseLower
             });
+            if (result is null || string.IsNullOrEmpty(result.AccessToken))
+            {
+                throw new UserFriendlyException("微信服务号AccessToken为空");
+            }
+
             return result;
         }, () => new DistributedCacheEntryOptions()
         {
@@ -107,7 +113,7 @@ public class FuwuhaoManager : DomainService
         response.EnsureSuccessStatusCode();
 
         var jsonContent = await response.Content.ReadAsStringAsync();
-        
+
         _logger.LogInformation($"服务号code获取用户基础信息：{jsonContent}");
         var result = JsonSerializer.Deserialize<UserBaseInfoResponse>(jsonContent);
 
@@ -175,7 +181,8 @@ public class FuwuhaoManager : DomainService
     /// <param name="title">图文消息标题</param>
     /// <param name="description">图文消息描述</param>
     /// <returns>XML格式的图文消息体</returns>
-    public string BuildRegisterMessage(string toUser, string title="意社区点击一键注册账号", string description="来自意社区SSO统一注册安全中心")
+    public string BuildRegisterMessage(string toUser, string title = "意社区点击一键注册账号",
+        string description = "来自意社区SSO统一注册安全中心")
     {
         var createTime = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
         var fromUser = _options.FromUser;
@@ -207,7 +214,8 @@ public class FuwuhaoManager : DomainService
     /// <param name="openId"></param>
     /// <param name="bindUserId"></param>
     /// <returns></returns>
-    public async Task<(SceneResultEnum SceneResult,Guid? UserId)> CallBackHandlerAsync(SceneTypeEnum sceneType, string openId, Guid? bindUserId)
+    public async Task<(SceneResultEnum SceneResult, Guid? UserId)> CallBackHandlerAsync(SceneTypeEnum sceneType,
+        string openId, Guid? bindUserId)
     {
         var aiUserInfo = await _userRepository._DbQueryable.Where(x => x.FuwuhaoOpenId == openId).FirstAsync();
         switch (sceneType)
@@ -216,12 +224,12 @@ public class FuwuhaoManager : DomainService
                 //有openid，说明登录成功
                 if (aiUserInfo is not null)
                 {
-                    return (SceneResultEnum.Login,aiUserInfo.UserId);
+                    return (SceneResultEnum.Login, aiUserInfo.UserId);
                 }
                 //无openid，说明需要进行注册
                 else
                 {
-                    return (SceneResultEnum.Register,null);
+                    return (SceneResultEnum.Register, null);
                 }
 
                 break;
@@ -240,7 +248,7 @@ public class FuwuhaoManager : DomainService
 
                 //说明没有绑定过，直接绑定
                 await _userRepository.InsertAsync(new AiUserExtraInfoEntity(bindUserId.Value, openId));
-                return (SceneResultEnum.Bind,bindUserId);
+                return (SceneResultEnum.Bind, bindUserId);
                 break;
             default:
                 throw new ArgumentOutOfRangeException(nameof(sceneType), sceneType, null);

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/InviteCodeManager.cs

@@ -0,0 +1,194 @@
+using Microsoft.Extensions.Logging;
+using SqlSugar;
+using Volo.Abp.Domain.Services;
+using Yi.Framework.AiHub.Domain.Entities;
+using Yi.Framework.SqlSugarCore.Abstractions;
+
+namespace Yi.Framework.AiHub.Domain.Managers;
+
+/// <summary>
+/// 邀请码管理器 - 负责邀请码核心业务逻辑
+/// </summary>
+public class InviteCodeManager : DomainService
+{
+    private readonly ISqlSugarRepository<InviteCodeAggregateRoot> _inviteCodeRepository;
+    private readonly ISqlSugarRepository<InvitationRecordAggregateRoot> _invitationRecordRepository;
+    private readonly ILogger<InviteCodeManager> _logger;
+
+    public InviteCodeManager(
+        ISqlSugarRepository<InviteCodeAggregateRoot> inviteCodeRepository,
+        ISqlSugarRepository<InvitationRecordAggregateRoot> invitationRecordRepository,
+        ILogger<InviteCodeManager> logger)
+    {
+        _inviteCodeRepository = inviteCodeRepository;
+        _invitationRecordRepository = invitationRecordRepository;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// 生成用户的邀请码
+    /// </summary>
+    /// <param name="userId">用户ID</param>
+    /// <returns>邀请码</returns>
+    public async Task<string> GenerateInviteCodeForUserAsync(Guid userId)
+    {
+        // 检查是否已有邀请码
+        var existingCode = await _inviteCodeRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .FirstAsync();
+
+        if (existingCode != null)
+        {
+            return existingCode.Code;
+        }
+
+        // 生成新邀请码
+        var code = GenerateUniqueInviteCode();
+        var inviteCode = new InviteCodeAggregateRoot(userId, code);
+        await _inviteCodeRepository.InsertAsync(inviteCode);
+
+        _logger.LogInformation($"用户 {userId} 生成邀请码 {code}");
+
+        return code;
+    }
+
+    /// <summary>
+    /// 获取用户的邀请码信息
+    /// </summary>
+    public async Task<InviteCodeAggregateRoot?> GetUserInviteCodeAsync(Guid userId)
+    {
+        return await _inviteCodeRepository._DbQueryable
+            .Where(x => x.UserId == userId)
+            .FirstAsync();
+    }
+
+    /// <summary>
+    /// 统计用户本周邀请人数（别人填写我的邀请码的次数/或者我填写别人邀请码）
+    /// </summary>
+    public async Task<int> GetWeeklyInvitationCountAsync(Guid userId, DateTime weekStart)
+    {
+        var inviterCount= await _invitationRecordRepository._DbQueryable
+            .Where(x => x.InviterId == userId)
+            .Where(x => x.InvitationTime >= weekStart)
+            .CountAsync();
+        var invitedUserIdCount= await _invitationRecordRepository._DbQueryable
+            .Where(x => x.InvitedUserId == userId)
+            .Where(x => x.InvitationTime >= weekStart)
+            .CountAsync();
+        return inviterCount + invitedUserIdCount;
+    }
+
+    /// <summary>
+    /// 获取邀请历史记录
+    /// </summary>
+    public async Task<List<InvitationHistoryDto>> GetInvitationHistoryAsync(Guid userId, int limit = 10)
+    {
+        return await _invitationRecordRepository._DbQueryable
+            .Where(x => x.InviterId == userId)
+            .OrderBy(x => x.InvitationTime, OrderByType.Desc)
+            .Take(limit)
+            .Select(x => new InvitationHistoryDto
+            {
+                InvitedUserName = "用户***", // 脱敏处理
+                InvitationTime = x.InvitationTime
+            })
+            .ToListAsync();
+    }
+
+    /// <summary>
+    /// 使用邀请码（双方都增加翻牌次数）
+    /// </summary>
+    /// <param name="userId">使用者ID</param>
+    /// <param name="inviteCode">邀请码</param>
+    /// <returns>邀请人ID</returns>
+    public async Task<Guid> UseInviteCodeAsync(Guid userId, string inviteCode)
+    {
+        if (string.IsNullOrWhiteSpace(inviteCode))
+        {
+            throw new UserFriendlyException("邀请码不能为空");
+        }
+
+        // 查找邀请码
+        var inviteCodeEntity = await _inviteCodeRepository._DbQueryable
+            .Where(x => x.Code == inviteCode)
+            .FirstAsync();
+
+        if (inviteCodeEntity == null)
+        {
+            throw new UserFriendlyException("邀请码不存在");
+        }
+
+        // 验证不能使用自己的邀请码
+        if (inviteCodeEntity.UserId == userId)
+        {
+            throw new UserFriendlyException("不能使用自己的邀请码");
+        }
+        
+        // 检查当前用户是否已经填写过别人的邀请码（一辈子只能填写一次）
+        var hasUsedOthersCode = await IsFilledInviteCodeAsync(userId);
+
+        if (hasUsedOthersCode)
+        {
+            throw new UserFriendlyException("您已经填写过别人的邀请码了，每个账号只能填写一次");
+        }
+        
+        // 增加邀请码被使用次数
+        inviteCodeEntity.UsedCount++;
+        await _inviteCodeRepository.UpdateAsync(inviteCodeEntity);
+        
+        // 创建邀请记录（双方都会因为这条记录增加一次翻牌机会）
+        var invitationRecord = new InvitationRecordAggregateRoot(
+            inviteCodeEntity.UserId,
+            userId,
+            inviteCode);
+        await _invitationRecordRepository.InsertAsync(invitationRecord);
+
+        _logger.LogInformation($"用户 {userId} 使用邀请码 {inviteCode} 成功，邀请人 {inviteCodeEntity.UserId} 和被邀请人 {userId} 都增加一次翻牌机会");
+
+        return inviteCodeEntity.UserId;
+    }
+
+    /// <summary>
+    /// 检查用户是否已填写过邀请码
+    /// </summary>
+    public async Task<bool> IsFilledInviteCodeAsync(Guid userId)
+    {
+        // 检查当前用户是否已经填写过别人的邀请码（一辈子只能填写一次）
+        return await _invitationRecordRepository._DbQueryable
+            .Where(x => x.InvitedUserId == userId)
+            .AnyAsync();
+    }
+
+    /// <summary>
+    /// 生成唯一邀请码
+    /// </summary>
+    private string GenerateUniqueInviteCode()
+    {
+        const string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+        var random = new Random();
+        var code = new char[8];
+
+        for (int i = 0; i < code.Length; i++)
+        {
+            code[i] = chars[random.Next(chars.Length)];
+        }
+
+        return new string(code);
+    }
+}
+
+/// <summary>
+/// 邀请历史记录DTO
+/// </summary>
+public class InvitationHistoryDto
+{
+    /// <summary>
+    /// 被邀请人名称(脱敏)
+    /// </summary>
+    public string InvitedUserName { get; set; } = string.Empty;
+
+    /// <summary>
+    /// 邀请时间
+    /// </summary>
+    public DateTime InvitationTime { get; set; }
+}

Yi.Abp.Net8/module/ai-hub/Yi.Framework.AiHub.Domain/Managers/PremiumPackageManager.cs

@@ -13,13 +13,14 @@ public class PremiumPackageManager : DomainService
 {
     private readonly ISqlSugarRepository<PremiumPackageAggregateRoot, Guid> _premiumPackageRepository;
     private readonly ILogger<PremiumPackageManager> _logger;
-
+    private readonly ISqlSugarRepository<AiRechargeAggregateRoot> _rechargeRepository;
     public PremiumPackageManager(
         ISqlSugarRepository<PremiumPackageAggregateRoot, Guid> premiumPackageRepository,
-        ILogger<PremiumPackageManager> logger)
+        ILogger<PremiumPackageManager> logger, ISqlSugarRepository<AiRechargeAggregateRoot> rechargeRepository)
     {
         _premiumPackageRepository = premiumPackageRepository;
         _logger = logger;
+        _rechargeRepository = rechargeRepository;
     }
 
     /// <summary>
@@ -57,6 +58,21 @@ public class PremiumPackageManager : DomainService
 
         await _premiumPackageRepository.InsertAsync(premiumPackage);
 
+        // 创建充值记录
+        var rechargeRecord = new AiRechargeAggregateRoot
+        {
+            UserId = userId,
+            RechargeAmount = totalAmount,
+            Content = packageName,
+            ExpireDateTime = premiumPackage.ExpireDateTime,
+            Remark = "自助充值",
+            ContactInfo = null,
+            RechargeType = RechargeTypeEnum.PremiumPackage
+        };
+
+        // 保存充值记录到数据库
+        await _rechargeRepository.InsertAsync(rechargeRecord);
+        
         _logger.LogInformation(
             $"用户 {userId} 购买尊享包成功: {packageName}, Token数量: {tokenAmount}, 金额: {totalAmount}");
 
@@ -69,12 +85,12 @@ public class PremiumPackageManager : DomainService
     /// <param name="userId">用户ID</param>
     /// <param name="tokenCount">需要消耗的Token数量</param>
     /// <returns>是否消耗成功</returns>
-    public async Task<bool> ConsumeTokensAsync(Guid userId, long tokenCount)
+    public async Task<bool> TryConsumeTokensAsync(Guid userId, long tokenCount)
     {
         // 获取用户所有可用的尊享包，按剩余token升序排列（优先消耗快用完的）
         var availablePackages = await _premiumPackageRepository._DbQueryable
-            .Where(x => x.UserId == userId && x.IsActive && x.RemainingTokens > 0)
-            .OrderBy(x => x.RemainingTokens)
+            .Where(x => x.UserId == userId && x.IsActive)
+            .OrderBy(x => x.CreationTime)
             .ToListAsync();
 
         if (!availablePackages.Any())
@@ -94,34 +110,12 @@ public class PremiumPackageManager : DomainService
             return false;
         }
 
-        // 计算总可用Token
-        var totalAvailableTokens = validPackages.Sum(p => p.RemainingTokens);
-        if (totalAvailableTokens < tokenCount)
-        {
-            _logger.LogWarning(
-                $"用户 {userId} 尊享包Token不足，需要: {tokenCount}, 可用: {totalAvailableTokens}");
-            return false;
-        }
+        var firstPackage = validPackages.First();
+        // 直接扣除最早的token包需要消耗的token，允许扣减到负数
+        firstPackage.ConsumeTokens(tokenCount);
+        await _premiumPackageRepository.UpdateAsync(firstPackage);
 
-        // 从可用的包中逐个扣除Token
-        var remainingToConsume = tokenCount;
-        foreach (var package in validPackages)
-        {
-            if (remainingToConsume <= 0)
-                break;
-
-            var toConsume = Math.Min(remainingToConsume, package.RemainingTokens);
-            if (package.ConsumeTokens(toConsume))
-            {
-                await _premiumPackageRepository.UpdateAsync(package);
-                remainingToConsume -= toConsume;
-
-                _logger.LogInformation(
-                    $"用户 {userId} 从尊享包 {package.Id} 消耗 {toConsume} tokens, 剩余: {package.RemainingTokens}");
-            }
-        }
-
-        return remainingToConsume == 0;
+        return true;
     }
 
     /// <summary>
@@ -130,55 +124,11 @@ public class PremiumPackageManager : DomainService
     /// <param name="userId">用户ID</param>
     /// <returns>可用Token总数</returns>
     public async Task<long> GetAvailableTokensAsync(Guid userId)
-    {
-        var packages = await _premiumPackageRepository._DbQueryable
-            .Where(x => x.UserId == userId && x.IsActive && x.RemainingTokens > 0)
-            .ToListAsync();
-
-        return packages
-            .Where(p => p.IsAvailable())
-            .Sum(p => p.RemainingTokens);
-    }
-
-    /// <summary>
-    /// 获取用户的所有尊享包
-    /// </summary>
-    /// <param name="userId">用户ID</param>
-    /// <returns>尊享包列表</returns>
-    public async Task<List<PremiumPackageAggregateRoot>> GetUserPremiumPackagesAsync(Guid userId)
     {
         return await _premiumPackageRepository._DbQueryable
-            .Where(x => x.UserId == userId)
-            .OrderByDescending(x => x.CreationTime)
-            .ToListAsync();
+            .Where(x => x.UserId == userId && x.IsActive && x.RemainingTokens > 0)
+            .Where(p => p.IsActive)
+            .Where(p => !p.ExpireDateTime.HasValue || p.ExpireDateTime.Value >= DateTime.Now)
+            .SumAsync(p => p.RemainingTokens);
     }
-
-    /// <summary>
-    /// 停用过期的尊享包
-    /// </summary>
-    /// <returns>停用的包数量</returns>
-    public async Task<int> DeactivateExpiredPackagesAsync()
-    {
-        _logger.LogInformation("开始执行尊享包过期自动停用任务");
-
-        var now = DateTime.Now;
-        var expiredPackages = await _premiumPackageRepository._DbQueryable
-            .Where(x => x.IsActive && x.ExpireDateTime.HasValue && x.ExpireDateTime.Value < now)
-            .ToListAsync();
-
-        if (!expiredPackages.Any())
-        {
-            _logger.LogInformation("没有找到过期的尊享包");
-            return 0;
-        }
-
-        foreach (var package in expiredPackages)
-        {
-            package.Deactivate();
-            await _premiumPackageRepository.UpdateAsync(package);
-        }
-
-        _logger.LogInformation($"成功停用 {expiredPackages.Count} 个过期的尊享包");
-        return expiredPackages.Count;
-    }
-}
+}