Revert "refactor: 清理租户API旧模块代码"

This reverts commit 992930a821.

src/Infrastructure/TakeoutSaaS.Infrastructure/App/Extensions/AppServiceCollectionExtensions.cs

@@ -1,57 +1,86 @@
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using TakeoutSaaS.Application.App.Stores.Services;
+using TakeoutSaaS.Domain.Deliveries.Repositories;
+using TakeoutSaaS.Domain.Inventory.Repositories;
+using TakeoutSaaS.Domain.Merchants.Repositories;
+using TakeoutSaaS.Domain.Merchants.Services;
+using TakeoutSaaS.Domain.Orders.Repositories;
+using TakeoutSaaS.Domain.Payments.Repositories;
+using TakeoutSaaS.Domain.Products.Repositories;
 using TakeoutSaaS.Domain.Stores.Repositories;
+using TakeoutSaaS.Domain.Tenants.Repositories;
+using TakeoutSaaS.Domain.Tenants.Services;
+using TakeoutSaaS.Infrastructure.App.Options;
 using TakeoutSaaS.Infrastructure.App.Persistence;
+using TakeoutSaaS.Infrastructure.Logs.Persistence;
+using TakeoutSaaS.Infrastructure.Logs.Repositories;
+using TakeoutSaaS.Infrastructure.App.Persistence.Repositories;
 using TakeoutSaaS.Infrastructure.App.Repositories;
+using TakeoutSaaS.Infrastructure.App.Services;
+using TakeoutSaaS.Infrastructure.Common.Extensions;
+using TakeoutSaaS.Shared.Abstractions.Constants;
 
 namespace TakeoutSaaS.Infrastructure.App.Extensions;
 
 /// <summary>
-/// 门店模块基础设施注入扩展。
+/// 业务主库基础设施注册扩展。
 /// </summary>
 public static class AppServiceCollectionExtensions
 {
     /// <summary>
-    /// 注册门店模块所需的 DbContext 与仓储。
+    /// 注册业务主库 DbContext 与仓储。
     /// </summary>
     /// <param name="services">服务集合。</param>
     /// <param name="configuration">配置源。</param>
     /// <returns>服务集合。</returns>
     public static IServiceCollection AddAppInfrastructure(this IServiceCollection services, IConfiguration configuration)
     {
-        // 1. 读取业务库连接串
-        var connectionString = ResolveAppDatabaseConnectionString(configuration);
+        services.AddDatabaseInfrastructure(configuration);
+        services.AddPostgresDbContext<TakeoutAppDbContext>(DatabaseConstants.AppDataSource);
+        services.AddPostgresDbContext<TakeoutLogsDbContext>(DatabaseConstants.LogsDataSource);
 
-        // 2. 注册门店业务 DbContext
-        services.AddDbContext<TakeoutTenantAppDbContext>(options =>
-        {
-            options.UseNpgsql(connectionString);
-        });
-
-        // 3. 注册门店仓储
+        services.AddScoped<IMerchantRepository, EfMerchantRepository>();
+        services.AddScoped<IMerchantCategoryRepository, EfMerchantCategoryRepository>();
         services.AddScoped<IStoreRepository, EfStoreRepository>();
+        services.AddScoped<IProductRepository, EfProductRepository>();
+        services.AddScoped<IOrderRepository, EfOrderRepository>();
+        services.AddScoped<IPaymentRepository, EfPaymentRepository>();
+        services.AddScoped<IDeliveryRepository, EfDeliveryRepository>();
+        services.AddScoped<ITenantRepository, EfTenantRepository>();
+        services.AddScoped<ITenantBillingRepository, TenantBillingRepository>();
+        services.AddScoped<ITenantPaymentRepository, TenantPaymentRepository>();
+        services.AddScoped<ITenantAnnouncementRepository, EfTenantAnnouncementRepository>();
+        services.AddScoped<ITenantAnnouncementReadRepository, EfTenantAnnouncementReadRepository>();
+        services.AddScoped<ITenantNotificationRepository, EfTenantNotificationRepository>();
+        services.AddScoped<ITenantPackageRepository, EfTenantPackageRepository>();
+        services.AddScoped<ITenantQuotaUsageRepository, EfTenantQuotaUsageRepository>();
+        services.AddScoped<ITenantQuotaUsageHistoryRepository, EfTenantQuotaUsageHistoryRepository>();
+        services.AddScoped<ITenantVisibilityRoleRuleRepository, TenantVisibilityRoleRuleRepository>();
+        services.AddScoped<IInventoryRepository, EfInventoryRepository>();
+        services.AddScoped<IQuotaPackageRepository, EfQuotaPackageRepository>();
+        services.AddScoped<IStatisticsRepository, EfStatisticsRepository>();
+        services.AddScoped<ISubscriptionRepository, EfSubscriptionRepository>();
+        services.AddScoped<IOperationLogRepository, EfOperationLogRepository>();
+
+        // 1. 账单领域/导出服务
+        services.AddScoped<IBillingDomainService, BillingDomainService>();
+        services.AddScoped<IBillingExportService, BillingExportService>();
+        services.AddScoped<IMerchantExportService, MerchantExportService>();
+
+        // 2. (空行后) 门店配置服务
+        services.AddScoped<IGeoJsonValidationService, GeoJsonValidationService>();
+        services.AddScoped<IDeliveryZoneService, DeliveryZoneService>();
+        services.AddScoped<IStoreFeeCalculationService, StoreFeeCalculationService>();
+        services.AddScoped<IStoreSchedulerService, StoreSchedulerService>();
+
+        // 3. (空行后) 初始化配置与种子
+        services.AddOptions<AppSeedOptions>()
+            .Bind(configuration.GetSection(AppSeedOptions.SectionName))
+            .ValidateDataAnnotations();
+
+        services.AddHostedService<AppDataSeeder>();
+
         return services;
     }
-
-    private static string ResolveAppDatabaseConnectionString(IConfiguration configuration)
-    {
-        // 1. 优先读取新结构配置
-        var writeConnection = configuration["Database:DataSources:AppDatabase:Write"];
-        if (!string.IsNullOrWhiteSpace(writeConnection))
-        {
-            return writeConnection;
-        }
-
-        // 2. 兼容 ConnectionStrings 配置
-        var fallbackConnection = configuration.GetConnectionString("AppDatabase");
-        if (!string.IsNullOrWhiteSpace(fallbackConnection))
-        {
-            return fallbackConnection;
-        }
-
-        // 3. 未配置时抛出异常
-        throw new InvalidOperationException("缺少业务库连接配置：Database:DataSources:AppDatabase:Write");
-    }
 }
-