diff --git a/src/Application/TakeoutSaaS.Application/App/Payments/Commands/CreatePaymentCommand.cs b/src/Application/TakeoutSaaS.Application/App/Payments/Commands/CreatePaymentCommand.cs index ed3c66c..2d1923a 100644 --- a/src/Application/TakeoutSaaS.Application/App/Payments/Commands/CreatePaymentCommand.cs +++ b/src/Application/TakeoutSaaS.Application/App/Payments/Commands/CreatePaymentCommand.cs @@ -30,7 +30,7 @@ public sealed class CreatePaymentCommand : IRequest public decimal Amount { get; set; } /// - /// 平台交易号。 + /// 系统交易号。 /// public string? TradeNo { get; set; } diff --git a/src/Application/TakeoutSaaS.Application/App/Payments/Commands/UpdatePaymentCommand.cs b/src/Application/TakeoutSaaS.Application/App/Payments/Commands/UpdatePaymentCommand.cs index 6b8e9ed..1889a10 100644 --- a/src/Application/TakeoutSaaS.Application/App/Payments/Commands/UpdatePaymentCommand.cs +++ b/src/Application/TakeoutSaaS.Application/App/Payments/Commands/UpdatePaymentCommand.cs @@ -35,7 +35,7 @@ public sealed record UpdatePaymentCommand : IRequest public decimal Amount { get; init; } /// - /// 平台交易号。 + /// 系统交易号。 /// public string? TradeNo { get; init; } diff --git a/src/Application/TakeoutSaaS.Application/App/Payments/Dto/PaymentDto.cs b/src/Application/TakeoutSaaS.Application/App/Payments/Dto/PaymentDto.cs index d127427..3852df0 100644 --- a/src/Application/TakeoutSaaS.Application/App/Payments/Dto/PaymentDto.cs +++ b/src/Application/TakeoutSaaS.Application/App/Payments/Dto/PaymentDto.cs @@ -43,7 +43,7 @@ public sealed class PaymentDto public decimal Amount { get; init; } /// - /// 平台交易号。 + /// 系统交易号。 /// public string? TradeNo { get; init; } diff --git a/src/Application/TakeoutSaaS.Application/App/Stores/Handlers/ToggleBusinessStatusCommandHandler.cs b/src/Application/TakeoutSaaS.Application/App/Stores/Handlers/ToggleBusinessStatusCommandHandler.cs index 24f8072..7bf5f61 100644 --- a/src/Application/TakeoutSaaS.Application/App/Stores/Handlers/ToggleBusinessStatusCommandHandler.cs +++ b/src/Application/TakeoutSaaS.Application/App/Stores/Handlers/ToggleBusinessStatusCommandHandler.cs @@ -37,7 +37,7 @@ public sealed class ToggleBusinessStatusCommandHandler( if (store.BusinessStatus == StoreBusinessStatus.ForceClosed) { - throw new BusinessException(ErrorCodes.Conflict, "门店已被平台强制关闭,无法切换"); + throw new BusinessException(ErrorCodes.Conflict, "门店已被风控强制关闭,无法切换"); } // 2. (空行后) 应用状态变更 diff --git a/src/Application/TakeoutSaaS.Application/App/Tenants/Dto/TenantPackageDto.cs b/src/Application/TakeoutSaaS.Application/App/Tenants/Dto/TenantPackageDto.cs index e901d5e..a3752c7 100644 --- a/src/Application/TakeoutSaaS.Application/App/Tenants/Dto/TenantPackageDto.cs +++ b/src/Application/TakeoutSaaS.Application/App/Tenants/Dto/TenantPackageDto.cs @@ -71,7 +71,7 @@ public sealed class TenantPackageDto public string? FeaturePoliciesJson { get; init; } /// - /// 是否仍启用(平台控制)。 + /// 是否仍启用(系统控制)。 /// public bool IsActive { get; init; } diff --git a/src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/CreateTenantAnnouncementCommandHandler.cs b/src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/CreateTenantAnnouncementCommandHandler.cs index 79dbb72..e45843c 100644 --- a/src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/CreateTenantAnnouncementCommandHandler.cs +++ b/src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/CreateTenantAnnouncementCommandHandler.cs @@ -29,7 +29,7 @@ public sealed class CreateTenantAnnouncementCommandHandler( /// 公告 DTO。 public async Task Handle(CreateTenantAnnouncementCommand request, CancellationToken cancellationToken) { - // 1. 校验租户上下文(租户端禁止跨租户/平台公告) + // 1. 校验租户上下文(租户端禁止跨租户/系统公告) var currentTenantId = tenantProvider.GetCurrentTenantId(); if (currentTenantId <= 0) { @@ -51,7 +51,7 @@ public sealed class CreateTenantAnnouncementCommandHandler( // 4. (空行后) 校验公告发布范围:租户端仅允许租户公告 if (request.PublisherScope != PublisherScope.Tenant) { - throw new BusinessException(ErrorCodes.ValidationFailed, "租户端不允许创建平台公告"); + throw new BusinessException(ErrorCodes.ValidationFailed, "租户端仅允许创建租户公告"); } if (string.IsNullOrWhiteSpace(request.TargetType)) diff --git a/src/Application/TakeoutSaaS.Application/App/Tenants/Validators/CreateAnnouncementCommandValidator.cs b/src/Application/TakeoutSaaS.Application/App/Tenants/Validators/CreateAnnouncementCommandValidator.cs index 0a3cb01..a1d1173 100644 --- a/src/Application/TakeoutSaaS.Application/App/Tenants/Validators/CreateAnnouncementCommandValidator.cs +++ b/src/Application/TakeoutSaaS.Application/App/Tenants/Validators/CreateAnnouncementCommandValidator.cs @@ -35,7 +35,7 @@ public sealed class CreateAnnouncementCommandValidator : AbstractValidator x.PublisherScope) .Equal(PublisherScope.Tenant) - .WithMessage("租户端不允许创建平台公告"); + .WithMessage("租户端仅允许创建租户公告"); RuleFor(x => x.EffectiveFrom) .LessThan(x => x.EffectiveTo!.Value) diff --git a/src/Application/TakeoutSaaS.Application/Identity/Contracts/CurrentUserProfile.cs b/src/Application/TakeoutSaaS.Application/Identity/Contracts/CurrentUserProfile.cs index 922b7d3..995efe2 100644 --- a/src/Application/TakeoutSaaS.Application/Identity/Contracts/CurrentUserProfile.cs +++ b/src/Application/TakeoutSaaS.Application/Identity/Contracts/CurrentUserProfile.cs @@ -26,7 +26,7 @@ public sealed class CurrentUserProfile public long TenantId { get; init; } /// - /// 所属商户 ID(平台管理员为空)。 + /// 所属商户 ID(租户管理员为空)。 /// public long? MerchantId { get; init; } diff --git a/src/Application/TakeoutSaaS.Application/Identity/Services/AdminAuthService.cs b/src/Application/TakeoutSaaS.Application/Identity/Services/AdminAuthService.cs index 7863b3d..890598e 100644 --- a/src/Application/TakeoutSaaS.Application/Identity/Services/AdminAuthService.cs +++ b/src/Application/TakeoutSaaS.Application/Identity/Services/AdminAuthService.cs @@ -288,7 +288,7 @@ public sealed class AdminAuthService( { var tenantId = user.TenantId; var roles = await ResolveUserRolesAsync(tenantId, user.Id, cancellationToken); - // 1. 强制仅允许租户管理员登录(平台不允许超级管理员) + // 1. 强制仅允许租户管理员登录(不支持超级管理员) EnsureTenantAdmin(tenantId, roles); // 2. 加载权限并返回档案 var permissions = await ResolveUserPermissionsAsync(tenantId, user.Id, cancellationToken); diff --git a/src/Domain/TakeoutSaaS.Domain/CustomerService/Entities/ChatSession.cs b/src/Domain/TakeoutSaaS.Domain/CustomerService/Entities/ChatSession.cs index d9ea66d..78e471c 100644 --- a/src/Domain/TakeoutSaaS.Domain/CustomerService/Entities/ChatSession.cs +++ b/src/Domain/TakeoutSaaS.Domain/CustomerService/Entities/ChatSession.cs @@ -24,7 +24,7 @@ public sealed class ChatSession : MultiTenantEntityBase public long? AgentUserId { get; set; } /// - /// 所属门店(可空为平台)。 + /// 所属门店(可空为系统会话)。 /// public long? StoreId { get; set; } diff --git a/src/Domain/TakeoutSaaS.Domain/Distribution/Entities/AffiliatePartner.cs b/src/Domain/TakeoutSaaS.Domain/Distribution/Entities/AffiliatePartner.cs index 551e39d..e5e22dd 100644 --- a/src/Domain/TakeoutSaaS.Domain/Distribution/Entities/AffiliatePartner.cs +++ b/src/Domain/TakeoutSaaS.Domain/Distribution/Entities/AffiliatePartner.cs @@ -9,7 +9,7 @@ namespace TakeoutSaaS.Domain.Distribution.Entities; public sealed class AffiliatePartner : MultiTenantEntityBase { /// - /// 用户 ID(如绑定平台账号)。 + /// 用户 ID(如绑定登录账号)。 /// public long? UserId { get; set; } diff --git a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/IdentityUser.cs b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/IdentityUser.cs index 70a46ed..96254e8 100644 --- a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/IdentityUser.cs +++ b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/IdentityUser.cs @@ -4,7 +4,7 @@ using TakeoutSaaS.Shared.Abstractions.Entities; namespace TakeoutSaaS.Domain.Identity.Entities; /// -/// 管理后台账户实体(平台管理员、租户管理员或商户员工)。 +/// 管理后台账户实体(租户管理员或商户员工)。 /// public sealed class IdentityUser : MultiTenantEntityBase { @@ -59,7 +59,7 @@ public sealed class IdentityUser : MultiTenantEntityBase public bool MustChangePassword { get; set; } /// - /// 所属商户(平台管理员为空)。 + /// 所属商户(租户管理员为空)。 /// public long? MerchantId { get; set; } diff --git a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplate.cs b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplate.cs index 2570321..6faeae5 100644 --- a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplate.cs +++ b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplate.cs @@ -3,7 +3,7 @@ using TakeoutSaaS.Shared.Abstractions.Entities; namespace TakeoutSaaS.Domain.Identity.Entities; /// -/// 角色模板定义(平台级)。 +/// 角色模板定义(系统级)。 /// public sealed class RoleTemplate : AuditableEntityBase { diff --git a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplatePermission.cs b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplatePermission.cs index f3f9896..a416c42 100644 --- a/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplatePermission.cs +++ b/src/Domain/TakeoutSaaS.Domain/Identity/Entities/RoleTemplatePermission.cs @@ -3,7 +3,7 @@ using TakeoutSaaS.Shared.Abstractions.Entities; namespace TakeoutSaaS.Domain.Identity.Entities; /// -/// 角色模板-权限关系(平台级)。 +/// 角色模板-权限关系(系统级)。 /// public sealed class RoleTemplatePermission : AuditableEntityBase { diff --git a/src/Domain/TakeoutSaaS.Domain/Merchants/Enums/MerchantAuditAction.cs b/src/Domain/TakeoutSaaS.Domain/Merchants/Enums/MerchantAuditAction.cs index 865b1ec..9d2c17d 100644 --- a/src/Domain/TakeoutSaaS.Domain/Merchants/Enums/MerchantAuditAction.cs +++ b/src/Domain/TakeoutSaaS.Domain/Merchants/Enums/MerchantAuditAction.cs @@ -35,16 +35,6 @@ public enum MerchantAuditAction /// MerchantReviewed = 5, - /// - /// 领取审核。 - /// - ReviewClaimed = 6, - - /// - /// 释放审核。 - /// - ReviewReleased = 7, - /// /// 审核通过。 /// @@ -63,10 +53,5 @@ public enum MerchantAuditAction /// /// 关键信息变更进入待审核。 /// - ReviewPendingReApproval = 11, - - /// - /// 强制接管审核。 - /// - ReviewForceClaimed = 12 + ReviewPendingReApproval = 11 } diff --git a/src/Domain/TakeoutSaaS.Domain/Payments/Entities/PaymentRecord.cs b/src/Domain/TakeoutSaaS.Domain/Payments/Entities/PaymentRecord.cs index 7ba0380..86e726d 100644 --- a/src/Domain/TakeoutSaaS.Domain/Payments/Entities/PaymentRecord.cs +++ b/src/Domain/TakeoutSaaS.Domain/Payments/Entities/PaymentRecord.cs @@ -29,7 +29,7 @@ public sealed class PaymentRecord : MultiTenantEntityBase public decimal Amount { get; set; } /// - /// 平台交易号。 + /// 系统交易号。 /// public string? TradeNo { get; set; } diff --git a/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreBusinessStatus.cs b/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreBusinessStatus.cs index c1d49c9..099690e 100644 --- a/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreBusinessStatus.cs +++ b/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreBusinessStatus.cs @@ -16,7 +16,7 @@ public enum StoreBusinessStatus Resting = 1, /// - /// 强制关闭(平台风控)。 + /// 强制关闭(风控)。 /// ForceClosed = 2 } diff --git a/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreClosureReason.cs b/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreClosureReason.cs index d0ac4a7..b751ab4 100644 --- a/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreClosureReason.cs +++ b/src/Domain/TakeoutSaaS.Domain/Stores/Enums/StoreClosureReason.cs @@ -36,9 +36,9 @@ public enum StoreClosureReason LicenseExpired = 5, /// - /// 平台封禁。 + /// 风控封禁。 /// - PlatformSuspended = 6, + RiskSuspended = 6, /// /// 其他原因。 diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/QuotaPackage.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/QuotaPackage.cs index c480561..48087e9 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/QuotaPackage.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/QuotaPackage.cs @@ -4,7 +4,7 @@ using TakeoutSaaS.Shared.Abstractions.Entities; namespace TakeoutSaaS.Domain.Tenants.Entities; /// -/// 配额包定义(平台提供的可购买配额包)。 +/// 配额包定义(系统提供的可购买配额包)。 /// public sealed class QuotaPackage : AuditableEntityBase { diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantAnnouncement.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantAnnouncement.cs index f3c73ab..b7e1908 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantAnnouncement.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantAnnouncement.cs @@ -44,7 +44,7 @@ public sealed class TenantAnnouncement : MultiTenantEntityBase public PublisherScope PublisherScope { get; set; } /// - /// 发布者用户 ID(平台或租户后台账号)。 + /// 发布者用户 ID(系统或租户后台账号)。 /// public long? PublisherUserId { get; set; } diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantPackage.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantPackage.cs index 3a89b15..d3dba58 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantPackage.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Entities/TenantPackage.cs @@ -4,7 +4,7 @@ using TakeoutSaaS.Shared.Abstractions.Entities; namespace TakeoutSaaS.Domain.Tenants.Entities; /// -/// 平台提供的租户套餐定义。 +/// 系统提供的租户套餐定义。 /// public sealed class TenantPackage : AuditableEntityBase { @@ -64,7 +64,7 @@ public sealed class TenantPackage : AuditableEntityBase public string? FeaturePoliciesJson { get; set; } /// - /// 是否仍启用(平台控制)。 + /// 是否仍启用(系统控制)。 /// public bool IsActive { get; set; } = true; diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/PublisherScope.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/PublisherScope.cs index b87ffd6..7ddefb5 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/PublisherScope.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/PublisherScope.cs @@ -6,9 +6,9 @@ namespace TakeoutSaaS.Domain.Tenants.Enums; public enum PublisherScope { /// - /// 平台发布。 + /// 系统发布。 /// - Platform = 0, + System = 0, /// /// 租户发布。 diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAnnouncementType.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAnnouncementType.cs index 0672fee..749e493 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAnnouncementType.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAnnouncementType.cs @@ -21,9 +21,9 @@ public enum TenantAnnouncementType Operation = 2, /// - /// 平台系统更新公告。 + /// 系统更新公告。 /// - SYSTEM_PLATFORM_UPDATE = 3, + SYSTEM_PRODUCT_UPDATE = 3, /// /// 系统安全公告。 diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAuditAction.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAuditAction.cs index 6395a2a..e86677f 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAuditAction.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Enums/TenantAuditAction.cs @@ -39,29 +39,4 @@ public enum TenantAuditAction /// 租户状态变更(启用/停用/到期等)。 /// StatusChanged = 7, - - /// - /// 领取入驻审核。 - /// - ReviewClaimed = 8, - - /// - /// 强制接管入驻审核。 - /// - ReviewForceClaimed = 9, - - /// - /// 释放入驻审核(审核完成或手动释放)。 - /// - ReviewClaimReleased = 10, - - /// - /// 平台伪装登录租户。 - /// - ImpersonatedLogin = 11, - - /// - /// 生成主管理员重置链接。 - /// - AdminResetLinkIssued = 12 } diff --git a/src/Domain/TakeoutSaaS.Domain/Tenants/Repositories/ISubscriptionRepository.cs b/src/Domain/TakeoutSaaS.Domain/Tenants/Repositories/ISubscriptionRepository.cs index 95d267e..596d003 100644 --- a/src/Domain/TakeoutSaaS.Domain/Tenants/Repositories/ISubscriptionRepository.cs +++ b/src/Domain/TakeoutSaaS.Domain/Tenants/Repositories/ISubscriptionRepository.cs @@ -15,7 +15,7 @@ public interface ISubscriptionRepository /// /// 订阅 ID。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 订阅实体,未找到返回 null。 Task FindByIdAsync( long subscriptionId, @@ -27,7 +27,7 @@ public interface ISubscriptionRepository /// /// 订阅 ID 列表。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 订阅实体列表。 Task> FindByIdsAsync( IEnumerable subscriptionIds, @@ -39,7 +39,7 @@ public interface ISubscriptionRepository /// /// 查询过滤条件。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 分页结果。 Task<(IReadOnlyList Items, int Total)> SearchPagedAsync( SubscriptionSearchFilter filter, @@ -51,7 +51,7 @@ public interface ISubscriptionRepository /// /// 订阅 ID。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 订阅详情信息。 Task GetDetailAsync( long subscriptionId, @@ -63,7 +63,7 @@ public interface ISubscriptionRepository /// /// 订阅 ID 列表。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 订阅与租户信息列表。 Task> FindByIdsWithTenantAsync( IEnumerable subscriptionIds, @@ -76,7 +76,7 @@ public interface ISubscriptionRepository /// 当前时间(UTC)。 /// 续费阈值时间(UTC),到期时间小于等于该时间视为候选。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 候选订阅集合(含套餐信息)。 Task> FindAutoRenewalCandidatesAsync( DateTime now, @@ -90,7 +90,7 @@ public interface ISubscriptionRepository /// 筛选开始时间(UTC,含)。 /// 筛选结束时间(UTC,不含)。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 候选订阅集合(含租户与套餐信息)。 Task> FindRenewalReminderCandidatesAsync( DateTime startOfDay, @@ -103,7 +103,7 @@ public interface ISubscriptionRepository /// /// 当前时间(UTC)。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 到期订阅集合。 Task> FindExpiredActiveSubscriptionsAsync( DateTime now, @@ -116,7 +116,7 @@ public interface ISubscriptionRepository /// 当前时间(UTC)。 /// 宽限期天数。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 宽限期到期订阅集合。 Task> FindGracePeriodExpiredSubscriptionsAsync( DateTime now, @@ -177,7 +177,7 @@ public interface ISubscriptionRepository /// /// 租户 ID。 /// 取消标记。 - /// 是否忽略租户过滤(用于平台级查询/任务)。 + /// 是否忽略租户过滤(用于系统级任务)。 /// 配额使用列表。 Task> GetQuotaUsagesAsync( long tenantId, diff --git a/src/Infrastructure/TakeoutSaaS.Infrastructure/Dictionary/Persistence/Seeds/InitialDictionaries.sql b/src/Infrastructure/TakeoutSaaS.Infrastructure/Dictionary/Persistence/Seeds/InitialDictionaries.sql index a8f6d33..b98fb3c 100644 --- a/src/Infrastructure/TakeoutSaaS.Infrastructure/Dictionary/Persistence/Seeds/InitialDictionaries.sql +++ b/src/Infrastructure/TakeoutSaaS.Infrastructure/Dictionary/Persistence/Seeds/InitialDictionaries.sql @@ -46,7 +46,7 @@ ON CONFLICT ("TenantId", "Code") DO NOTHING; INSERT INTO dictionary_items ("Id", "TenantId", "GroupId", "Key", "Value", "IsDefault", "IsEnabled", "SortOrder", "Description", "CreatedAt", "CreatedBy") VALUES - (10031, 0, 1003, 'PLATFORM_DELIVERY', '{"zh-CN":"平台配送","en":"Platform Delivery"}', true, true, 10, '平台自有骑手配送', CURRENT_TIMESTAMP, 0), + (10031, 0, 1003, 'SYSTEM_DELIVERY', '{"zh-CN":"系统配送","en":"System Delivery"}', true, true, 10, '系统自有骑手配送', CURRENT_TIMESTAMP, 0), (10032, 0, 1003, 'MERCHANT_DELIVERY', '{"zh-CN":"商家配送","en":"Merchant Delivery"}', false, true, 20, '商家自行配送', CURRENT_TIMESTAMP, 0), (10033, 0, 1003, 'SELF_PICKUP', '{"zh-CN":"到店自取","en":"Self Pickup"}', false, true, 30, '顾客到店自取', CURRENT_TIMESTAMP, 0) ON CONFLICT ("TenantId", "GroupId", "Key") DO NOTHING; diff --git a/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Options/AdminSeedOptions.cs b/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Options/AdminSeedOptions.cs index 03f6333..eab01eb 100644 --- a/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Options/AdminSeedOptions.cs +++ b/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Options/AdminSeedOptions.cs @@ -52,7 +52,7 @@ public sealed class SeedUserOptions public long TenantId { get; set; } /// - /// 所属商户 ID(平台管理员为空)。 + /// 所属商户 ID(租户管理员为空)。 /// public long? MerchantId { get; set; } diff --git a/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/IdentityDbContext.cs b/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/IdentityDbContext.cs index 9d0467b..3800b5b 100644 --- a/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/IdentityDbContext.cs +++ b/src/Infrastructure/TakeoutSaaS.Infrastructure/Identity/Persistence/IdentityDbContext.cs @@ -35,7 +35,7 @@ public sealed class IdentityDbContext( public DbSet Roles => Set(); /// - /// 角色模板集合(平台级)。 + /// 角色模板集合(系统级)。 /// public DbSet RoleTemplates => Set(); diff --git a/src/Modules/TakeoutSaaS.Module.Sms/Models/SmsSendResult.cs b/src/Modules/TakeoutSaaS.Module.Sms/Models/SmsSendResult.cs index afc81fb..dfdd69f 100644 --- a/src/Modules/TakeoutSaaS.Module.Sms/Models/SmsSendResult.cs +++ b/src/Modules/TakeoutSaaS.Module.Sms/Models/SmsSendResult.cs @@ -11,7 +11,7 @@ public sealed class SmsSendResult public bool Success { get; init; } /// - /// 平台返回的请求标识。 + /// 服务商返回的请求标识。 /// public string? RequestId { get; init; } diff --git a/tests/TakeoutSaaS.Application.Tests/App/Tenants/Validators/CreateAnnouncementCommandValidatorTests.cs b/tests/TakeoutSaaS.Application.Tests/App/Tenants/Validators/CreateAnnouncementCommandValidatorTests.cs index 8bbae52..af52c42 100644 --- a/tests/TakeoutSaaS.Application.Tests/App/Tenants/Validators/CreateAnnouncementCommandValidatorTests.cs +++ b/tests/TakeoutSaaS.Application.Tests/App/Tenants/Validators/CreateAnnouncementCommandValidatorTests.cs @@ -84,7 +84,7 @@ public sealed class CreateAnnouncementCommandValidatorTests // Arrange var command = AnnouncementTestData.CreateValidCreateCommand() with { - PublisherScope = PublisherScope.Platform + PublisherScope = PublisherScope.System }; // Act