msumshk/TakeoutSaaS.TenantApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 租户审核领单与强制接管

Browse Source
This commit is contained in:
MSuMshk
2025-12-15 10:40:50 +08:00
parent f54d4cf405
commit 2339775fcb
21 changed files with 7519 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/Application/TakeoutSaaS.Application/App/Tenants/Commands/ClaimTenantReviewCommand.cs Normal file
View File

@@ -0,0 +1,17 @@
using MediatR;
using System.ComponentModel.DataAnnotations;
using TakeoutSaaS.Application.App.Tenants.Dto;
namespace TakeoutSaaS.Application.App.Tenants.Commands;
/// <summary>
/// 领取租户入驻审核命令。
/// </summary>
public sealed record ClaimTenantReviewCommand : IRequest<TenantReviewClaimDto>
{
/// <summary>
/// 租户 ID（雪花算法）。
/// </summary>
[Required]
public long TenantId { get; init; }
}

17
src/Application/TakeoutSaaS.Application/App/Tenants/Commands/ForceClaimTenantReviewCommand.cs Normal file
View File

@@ -0,0 +1,17 @@
using MediatR;
using System.ComponentModel.DataAnnotations;
using TakeoutSaaS.Application.App.Tenants.Dto;
namespace TakeoutSaaS.Application.App.Tenants.Commands;
/// <summary>
/// 强制接管租户入驻审核命令（仅超级管理员可用）。
/// </summary>
public sealed record ForceClaimTenantReviewCommand : IRequest<TenantReviewClaimDto>
{
/// <summary>
/// 租户 ID（雪花算法）。
/// </summary>
[Required]
public long TenantId { get; init; }
}

17
src/Application/TakeoutSaaS.Application/App/Tenants/Commands/ReleaseTenantReviewClaimCommand.cs Normal file
View File

@@ -0,0 +1,17 @@
using MediatR;
using System.ComponentModel.DataAnnotations;
using TakeoutSaaS.Application.App.Tenants.Dto;
namespace TakeoutSaaS.Application.App.Tenants.Commands;
/// <summary>
/// 释放租户入驻审核领取命令。
/// </summary>
public sealed record ReleaseTenantReviewClaimCommand : IRequest<TenantReviewClaimDto?>
{
/// <summary>
/// 租户 ID（雪花算法）。
/// </summary>
[Required]
public long TenantId { get; init; }
}

38
src/Application/TakeoutSaaS.Application/App/Tenants/Dto/TenantReviewClaimDto.cs Normal file
View File

@@ -0,0 +1,38 @@
using System.Text.Json.Serialization;
using TakeoutSaaS.Shared.Abstractions.Serialization;
namespace TakeoutSaaS.Application.App.Tenants.Dto;
/// <summary>
/// 租户审核领取信息 DTO。
/// </summary>
public sealed class TenantReviewClaimDto
{
/// <summary>
/// 领取记录 ID。
/// </summary>
[JsonConverter(typeof(SnowflakeIdJsonConverter))]
public long Id { get; init; }
/// <summary>
/// 租户 ID。
/// </summary>
[JsonConverter(typeof(SnowflakeIdJsonConverter))]
public long TenantId { get; init; }
/// <summary>
/// 领取人用户 ID。
/// </summary>
[JsonConverter(typeof(SnowflakeIdJsonConverter))]
public long ClaimedBy { get; init; }
/// <summary>
/// 领取人名称。
/// </summary>
public string ClaimedByName { get; init; } = string.Empty;
/// <summary>
/// 领取时间。
/// </summary>
public DateTime ClaimedAt { get; init; }
}

92
src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/ClaimTenantReviewCommandHandler.cs Normal file
View File

@@ -0,0 +1,92 @@
using MediatR;
using TakeoutSaaS.Application.App.Tenants.Commands;
using TakeoutSaaS.Application.App.Tenants.Dto;
using TakeoutSaaS.Application.Identity.Abstractions;
using TakeoutSaaS.Domain.Tenants.Entities;
using TakeoutSaaS.Domain.Tenants.Enums;
using TakeoutSaaS.Domain.Tenants.Repositories;
using TakeoutSaaS.Shared.Abstractions.Constants;
using TakeoutSaaS.Shared.Abstractions.Exceptions;
using TakeoutSaaS.Shared.Abstractions.Security;
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
/// <summary>
/// 领取租户入驻审核处理器。
/// </summary>
public sealed class ClaimTenantReviewCommandHandler(
ITenantRepository tenantRepository,
ICurrentUserAccessor currentUserAccessor,
IAdminAuthService adminAuthService)
: IRequestHandler<ClaimTenantReviewCommand, TenantReviewClaimDto>
{
/// <inheritdoc />
public async Task<TenantReviewClaimDto> Handle(ClaimTenantReviewCommand request, CancellationToken cancellationToken)
{
// 1. 校验租户存在
var tenant = await tenantRepository.FindByIdAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.NotFound, "租户不存在");
// 2. 查询是否已领取
var existingClaim = await tenantRepository.GetActiveReviewClaimAsync(request.TenantId, cancellationToken);
if (existingClaim != null)
{
if (existingClaim.ClaimedBy == currentUserAccessor.UserId)
{
return existingClaim.ToDto();
}
throw new BusinessException(ErrorCodes.Conflict, $"该审核已被 {existingClaim.ClaimedByName} 领取");
}
// 3. (空行后) 获取当前用户显示名（用于展示快照）
var profile = await adminAuthService.GetProfileAsync(currentUserAccessor.UserId, cancellationToken);
var displayName = string.IsNullOrWhiteSpace(profile.DisplayName)
? $"user:{currentUserAccessor.UserId}"
: profile.DisplayName;
// 4. (空行后) 构造领取记录与审计日志
var now = DateTime.UtcNow;
var claim = new TenantReviewClaim
{
TenantId = request.TenantId,
ClaimedBy = currentUserAccessor.UserId,
ClaimedByName = displayName,
ClaimedAt = now,
ReleasedAt = null
};
var auditLog = new TenantAuditLog
{
TenantId = tenant.Id,
Action = TenantAuditAction.ReviewClaimed,
Title = "领取审核",
Description = $"领取人：{displayName}",
OperatorId = currentUserAccessor.UserId,
OperatorName = displayName,
PreviousStatus = tenant.Status,
CurrentStatus = tenant.Status
};
// 5. (空行后) 写入领取记录（处理并发领取冲突）
var success = await tenantRepository.TryAddReviewClaimAsync(claim, auditLog, cancellationToken);
if (!success)
{
var current = await tenantRepository.GetActiveReviewClaimAsync(request.TenantId, cancellationToken);
if (current == null)
{
throw new BusinessException(ErrorCodes.Conflict, "审核领取失败，请刷新后重试");
}
if (current.ClaimedBy == currentUserAccessor.UserId)
{
return current.ToDto();
}
throw new BusinessException(ErrorCodes.Conflict, $"该审核已被 {current.ClaimedByName} 领取");
}
// 6. (空行后) 返回领取结果
return claim.ToDto();
}
}

106
src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/ForceClaimTenantReviewCommandHandler.cs Normal file
View File

@@ -0,0 +1,106 @@
using MediatR;
using TakeoutSaaS.Application.App.Tenants.Commands;
using TakeoutSaaS.Application.App.Tenants.Dto;
using TakeoutSaaS.Application.Identity.Abstractions;
using TakeoutSaaS.Domain.Tenants.Entities;
using TakeoutSaaS.Domain.Tenants.Enums;
using TakeoutSaaS.Domain.Tenants.Repositories;
using TakeoutSaaS.Shared.Abstractions.Constants;
using TakeoutSaaS.Shared.Abstractions.Exceptions;
using TakeoutSaaS.Shared.Abstractions.Security;
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
/// <summary>
/// 强制接管租户入驻审核处理器。
/// </summary>
public sealed class ForceClaimTenantReviewCommandHandler(
ITenantRepository tenantRepository,
ICurrentUserAccessor currentUserAccessor,
IAdminAuthService adminAuthService)
: IRequestHandler<ForceClaimTenantReviewCommand, TenantReviewClaimDto>
{
/// <inheritdoc />
public async Task<TenantReviewClaimDto> Handle(ForceClaimTenantReviewCommand request, CancellationToken cancellationToken)
{
// 1. 校验租户存在
var tenant = await tenantRepository.FindByIdAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.NotFound, "租户不存在");
// 2. 获取当前用户显示名（用于展示快照）
var profile = await adminAuthService.GetProfileAsync(currentUserAccessor.UserId, cancellationToken);
var displayName = string.IsNullOrWhiteSpace(profile.DisplayName)
? $"user:{currentUserAccessor.UserId}"
: profile.DisplayName;
// 3. (空行后) 读取当前领取记录（可跟踪用于更新）
var claim = await tenantRepository.FindActiveReviewClaimAsync(request.TenantId, cancellationToken);
if (claim == null)
{
// 4. 未领取则直接创建（记录强制接管动作）
var now = DateTime.UtcNow;
var created = new TenantReviewClaim
{
TenantId = request.TenantId,
ClaimedBy = currentUserAccessor.UserId,
ClaimedByName = displayName,
ClaimedAt = now,
ReleasedAt = null
};
var auditLog = new TenantAuditLog
{
TenantId = tenant.Id,
Action = TenantAuditAction.ReviewForceClaimed,
Title = "强制接管审核",
Description = $"接管人：{displayName}",
OperatorId = currentUserAccessor.UserId,
OperatorName = displayName,
PreviousStatus = tenant.Status,
CurrentStatus = tenant.Status
};
var success = await tenantRepository.TryAddReviewClaimAsync(created, auditLog, cancellationToken);
if (!success)
{
var current = await tenantRepository.GetActiveReviewClaimAsync(request.TenantId, cancellationToken);
if (current != null)
{
return current.ToDto();
}
throw new BusinessException(ErrorCodes.Conflict, "审核接管失败，请刷新后重试");
}
return created.ToDto();
}
// 5. (空行后) 已由自己领取则直接返回
if (claim.ClaimedBy == currentUserAccessor.UserId)
{
return claim.ToDto();
}
// 6. (空行后) 更新领取人并记录审计
var previousOwner = claim.ClaimedByName;
claim.ClaimedBy = currentUserAccessor.UserId;
claim.ClaimedByName = displayName;
claim.ClaimedAt = DateTime.UtcNow;
await tenantRepository.UpdateReviewClaimAsync(claim, cancellationToken);
await tenantRepository.AddAuditLogAsync(new TenantAuditLog
{
TenantId = tenant.Id,
Action = TenantAuditAction.ReviewForceClaimed,
Title = "强制接管审核",
Description = $"原领取人：{previousOwner}，接管人：{displayName}",
OperatorId = currentUserAccessor.UserId,
OperatorName = displayName,
PreviousStatus = tenant.Status,
CurrentStatus = tenant.Status
}, cancellationToken);
await tenantRepository.SaveChangesAsync(cancellationToken);
return claim.ToDto();
}
}

21
src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/GetTenantReviewClaimQueryHandler.cs Normal file
View File

@@ -0,0 +1,21 @@
using MediatR;
using TakeoutSaaS.Application.App.Tenants.Dto;
using TakeoutSaaS.Application.App.Tenants.Queries;
using TakeoutSaaS.Domain.Tenants.Repositories;
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
/// <summary>
/// 获取租户审核领取信息查询处理器。
/// </summary>
public sealed class GetTenantReviewClaimQueryHandler(ITenantRepository tenantRepository)
: IRequestHandler<GetTenantReviewClaimQuery, TenantReviewClaimDto?>
{
/// <inheritdoc />
public async Task<TenantReviewClaimDto?> Handle(GetTenantReviewClaimQuery request, CancellationToken cancellationToken)
{
// 1. 查询当前领取信息（未领取返回 null）
var claim = await tenantRepository.GetActiveReviewClaimAsync(request.TenantId, cancellationToken);
return claim?.ToDto();
}
}

67
src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/ReleaseTenantReviewClaimCommandHandler.cs Normal file
View File

@@ -0,0 +1,67 @@
using MediatR;
using TakeoutSaaS.Application.App.Tenants.Commands;
using TakeoutSaaS.Application.App.Tenants.Dto;
using TakeoutSaaS.Application.Identity.Abstractions;
using TakeoutSaaS.Domain.Tenants.Entities;
using TakeoutSaaS.Domain.Tenants.Enums;
using TakeoutSaaS.Domain.Tenants.Repositories;
using TakeoutSaaS.Shared.Abstractions.Constants;
using TakeoutSaaS.Shared.Abstractions.Exceptions;
using TakeoutSaaS.Shared.Abstractions.Security;
namespace TakeoutSaaS.Application.App.Tenants.Handlers;
/// <summary>
/// 释放租户入驻审核领取处理器。
/// </summary>
public sealed class ReleaseTenantReviewClaimCommandHandler(
ITenantRepository tenantRepository,
ICurrentUserAccessor currentUserAccessor,
IAdminAuthService adminAuthService)
: IRequestHandler<ReleaseTenantReviewClaimCommand, TenantReviewClaimDto?>
{
/// <inheritdoc />
public async Task<TenantReviewClaimDto?> Handle(ReleaseTenantReviewClaimCommand request, CancellationToken cancellationToken)
{
// 1. 校验租户存在
var tenant = await tenantRepository.FindByIdAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.NotFound, "租户不存在");
// 2. 查询当前领取记录
var claim = await tenantRepository.FindActiveReviewClaimAsync(request.TenantId, cancellationToken);
if (claim == null)
{
return null;
}
// 3. (空行后) 非领取人不允许释放（如需接管请使用强制接管）
if (claim.ClaimedBy != currentUserAccessor.UserId)
{
throw new BusinessException(ErrorCodes.Conflict, $"该审核已被 {claim.ClaimedByName} 领取");
}
// 4. (空行后) 释放领取并记录审计
var profile = await adminAuthService.GetProfileAsync(currentUserAccessor.UserId, cancellationToken);
var displayName = string.IsNullOrWhiteSpace(profile.DisplayName)
? $"user:{currentUserAccessor.UserId}"
: profile.DisplayName;
claim.ReleasedAt = DateTime.UtcNow;
await tenantRepository.UpdateReviewClaimAsync(claim, cancellationToken);
await tenantRepository.AddAuditLogAsync(new TenantAuditLog
{
TenantId = tenant.Id,
Action = TenantAuditAction.ReviewClaimReleased,
Title = "释放审核",
Description = $"释放人：{displayName}",
OperatorId = currentUserAccessor.UserId,
OperatorName = displayName,
PreviousStatus = tenant.Status,
CurrentStatus = tenant.Status
}, cancellationToken);
await tenantRepository.SaveChangesAsync(cancellationToken);
return claim.ToDto();
}
}

25
src/Application/TakeoutSaaS.Application/App/Tenants/Handlers/ReviewTenantCommandHandler.cs
View File

@@ -24,6 +24,14 @@ public sealed class ReviewTenantCommandHandler(
var tenant = await tenantRepository.FindByIdAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.NotFound, "租户不存在");
var reviewClaim = await tenantRepository.FindActiveReviewClaimAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.Conflict, "请先领取审核");
if (reviewClaim.ClaimedBy != currentUserAccessor.UserId)
{
throw new BusinessException(ErrorCodes.Conflict, $"该审核已被 {reviewClaim.ClaimedByName} 领取");
}
var verification = await tenantRepository.GetVerificationProfileAsync(request.TenantId, cancellationToken)
?? throw new BusinessException(ErrorCodes.BadRequest, "请先提交实名认证资料");
@@ -83,7 +91,22 @@ public sealed class ReviewTenantCommandHandler(
CurrentStatus = tenant.Status
}, cancellationToken);
// 7. 保存并返回 DTO
// 7. (空行后) 审核完成自动释放领取
reviewClaim.ReleasedAt = DateTime.UtcNow;
await tenantRepository.UpdateReviewClaimAsync(reviewClaim, cancellationToken);
await tenantRepository.AddAuditLogAsync(new Domain.Tenants.Entities.TenantAuditLog
{
TenantId = tenant.Id,
Action = TenantAuditAction.ReviewClaimReleased,
Title = "审核完成释放",
Description = $"释放人：{actorName}",
OperatorId = currentUserAccessor.UserId == 0 ? null : currentUserAccessor.UserId,
OperatorName = actorName,
PreviousStatus = tenant.Status,
CurrentStatus = tenant.Status
}, cancellationToken);
// 8. 保存并返回 DTO
await tenantRepository.SaveChangesAsync(cancellationToken);
return TenantMapping.ToDto(tenant, subscription, verification);

9
src/Application/TakeoutSaaS.Application/App/Tenants/Queries/GetTenantReviewClaimQuery.cs Normal file
View File

@@ -0,0 +1,9 @@
using MediatR;
using TakeoutSaaS.Application.App.Tenants.Dto;
namespace TakeoutSaaS.Application.App.Tenants.Queries;
/// <summary>
/// 获取租户审核领取信息查询。
/// </summary>
public sealed record GetTenantReviewClaimQuery(long TenantId) : IRequest<TenantReviewClaimDto?>;

15
src/Application/TakeoutSaaS.Application/App/Tenants/TenantMapping.cs
View File

@@ -102,6 +102,21 @@ internal static class TenantMapping
CreatedAt = log.CreatedAt
};
/// <summary>
/// 将审核领取实体映射为 DTO。
/// </summary>
/// <param name="claim">领取实体。</param>
/// <returns>领取 DTO。</returns>
public static TenantReviewClaimDto ToDto(this TenantReviewClaim claim)
=> new()
{
Id = claim.Id,
TenantId = claim.TenantId,
ClaimedBy = claim.ClaimedBy,
ClaimedByName = claim.ClaimedByName,
ClaimedAt = claim.ClaimedAt
};
/// <summary>
/// 将套餐实体映射为 DTO。
/// </summary>