refactor: 清理租户API旧模块代码
This commit is contained in:
@@ -1,67 +0,0 @@
|
||||
using MediatR;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using TakeoutSaaS.Application.App.Payments.Commands;
|
||||
using TakeoutSaaS.Application.App.Payments.Dto;
|
||||
using TakeoutSaaS.Domain.Payments.Entities;
|
||||
using TakeoutSaaS.Domain.Payments.Repositories;
|
||||
|
||||
namespace TakeoutSaaS.Application.App.Payments.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// 创建支付记录命令处理器。
|
||||
/// </summary>
|
||||
public sealed class CreatePaymentCommandHandler(IPaymentRepository paymentRepository, ILogger<CreatePaymentCommandHandler> logger)
|
||||
: IRequestHandler<CreatePaymentCommand, PaymentDto>
|
||||
{
|
||||
private readonly IPaymentRepository _paymentRepository = paymentRepository;
|
||||
private readonly ILogger<CreatePaymentCommandHandler> _logger = logger;
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<PaymentDto> Handle(CreatePaymentCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
var payment = new PaymentRecord
|
||||
{
|
||||
OrderId = request.OrderId,
|
||||
Method = request.Method,
|
||||
Status = request.Status,
|
||||
Amount = request.Amount,
|
||||
TradeNo = request.TradeNo?.Trim(),
|
||||
ChannelTransactionId = request.ChannelTransactionId?.Trim(),
|
||||
PaidAt = request.PaidAt,
|
||||
Remark = request.Remark?.Trim(),
|
||||
Payload = request.Payload
|
||||
};
|
||||
|
||||
await _paymentRepository.AddPaymentAsync(payment, cancellationToken);
|
||||
await _paymentRepository.SaveChangesAsync(cancellationToken);
|
||||
_logger.LogInformation("创建支付记录 {PaymentId} 对应订单 {OrderId}", payment.Id, payment.OrderId);
|
||||
|
||||
return MapToDto(payment, []);
|
||||
}
|
||||
|
||||
private static PaymentDto MapToDto(PaymentRecord payment, IReadOnlyList<PaymentRefundRecord> refunds) => new()
|
||||
{
|
||||
Id = payment.Id,
|
||||
TenantId = payment.TenantId,
|
||||
OrderId = payment.OrderId,
|
||||
Method = payment.Method,
|
||||
Status = payment.Status,
|
||||
Amount = payment.Amount,
|
||||
TradeNo = payment.TradeNo,
|
||||
ChannelTransactionId = payment.ChannelTransactionId,
|
||||
PaidAt = payment.PaidAt,
|
||||
Remark = payment.Remark,
|
||||
Payload = payment.Payload,
|
||||
CreatedAt = payment.CreatedAt,
|
||||
Refunds = refunds.Select(x => new PaymentRefundDto
|
||||
{
|
||||
Id = x.Id,
|
||||
PaymentRecordId = x.PaymentRecordId,
|
||||
OrderId = x.OrderId,
|
||||
Amount = x.Amount,
|
||||
ChannelRefundId = x.ChannelRefundId,
|
||||
Status = x.Status,
|
||||
Payload = x.Payload
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
@@ -1,38 +0,0 @@
|
||||
using MediatR;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using TakeoutSaaS.Application.App.Payments.Commands;
|
||||
using TakeoutSaaS.Domain.Payments.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.App.Payments.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// 删除支付记录命令处理器。
|
||||
/// </summary>
|
||||
public sealed class DeletePaymentCommandHandler(
|
||||
IPaymentRepository paymentRepository,
|
||||
ITenantProvider tenantProvider,
|
||||
ILogger<DeletePaymentCommandHandler> logger)
|
||||
: IRequestHandler<DeletePaymentCommand, bool>
|
||||
{
|
||||
private readonly IPaymentRepository _paymentRepository = paymentRepository;
|
||||
private readonly ITenantProvider _tenantProvider = tenantProvider;
|
||||
private readonly ILogger<DeletePaymentCommandHandler> _logger = logger;
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<bool> Handle(DeletePaymentCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
var tenantId = _tenantProvider.GetCurrentTenantId();
|
||||
var existing = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
|
||||
if (existing == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
await _paymentRepository.DeletePaymentAsync(request.PaymentId, tenantId, cancellationToken);
|
||||
await _paymentRepository.SaveChangesAsync(cancellationToken);
|
||||
_logger.LogInformation("删除支付记录 {PaymentId}", request.PaymentId);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,60 +0,0 @@
|
||||
using MediatR;
|
||||
using TakeoutSaaS.Application.App.Payments.Dto;
|
||||
using TakeoutSaaS.Application.App.Payments.Queries;
|
||||
using TakeoutSaaS.Domain.Payments.Entities;
|
||||
using TakeoutSaaS.Domain.Payments.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.App.Payments.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// 支付记录详情查询处理器。
|
||||
/// </summary>
|
||||
public sealed class GetPaymentByIdQueryHandler(
|
||||
IPaymentRepository paymentRepository,
|
||||
ITenantProvider tenantProvider)
|
||||
: IRequestHandler<GetPaymentByIdQuery, PaymentDto?>
|
||||
{
|
||||
private readonly IPaymentRepository _paymentRepository = paymentRepository;
|
||||
private readonly ITenantProvider _tenantProvider = tenantProvider;
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<PaymentDto?> Handle(GetPaymentByIdQuery request, CancellationToken cancellationToken)
|
||||
{
|
||||
var tenantId = _tenantProvider.GetCurrentTenantId();
|
||||
var payment = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
|
||||
if (payment == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
var refunds = await _paymentRepository.GetRefundsAsync(payment.Id, tenantId, cancellationToken);
|
||||
return MapToDto(payment, refunds);
|
||||
}
|
||||
|
||||
private static PaymentDto MapToDto(PaymentRecord payment, IReadOnlyList<PaymentRefundRecord> refunds) => new()
|
||||
{
|
||||
Id = payment.Id,
|
||||
TenantId = payment.TenantId,
|
||||
OrderId = payment.OrderId,
|
||||
Method = payment.Method,
|
||||
Status = payment.Status,
|
||||
Amount = payment.Amount,
|
||||
TradeNo = payment.TradeNo,
|
||||
ChannelTransactionId = payment.ChannelTransactionId,
|
||||
PaidAt = payment.PaidAt,
|
||||
Remark = payment.Remark,
|
||||
Payload = payment.Payload,
|
||||
CreatedAt = payment.CreatedAt,
|
||||
Refunds = refunds.Select(x => new PaymentRefundDto
|
||||
{
|
||||
Id = x.Id,
|
||||
PaymentRecordId = x.PaymentRecordId,
|
||||
OrderId = x.OrderId,
|
||||
Amount = x.Amount,
|
||||
ChannelRefundId = x.ChannelRefundId,
|
||||
Status = x.Status,
|
||||
Payload = x.Payload
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
using MediatR;
|
||||
using TakeoutSaaS.Application.App.Payments.Dto;
|
||||
using TakeoutSaaS.Application.App.Payments.Queries;
|
||||
using TakeoutSaaS.Domain.Payments.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Results;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.App.Payments.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// 支付记录列表查询处理器。
|
||||
/// </summary>
|
||||
public sealed class SearchPaymentsQueryHandler(
|
||||
IPaymentRepository paymentRepository,
|
||||
ITenantProvider tenantProvider)
|
||||
: IRequestHandler<SearchPaymentsQuery, PagedResult<PaymentDto>>
|
||||
{
|
||||
private readonly IPaymentRepository _paymentRepository = paymentRepository;
|
||||
private readonly ITenantProvider _tenantProvider = tenantProvider;
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<PagedResult<PaymentDto>> Handle(SearchPaymentsQuery request, CancellationToken cancellationToken)
|
||||
{
|
||||
var tenantId = _tenantProvider.GetCurrentTenantId();
|
||||
var payments = await _paymentRepository.SearchAsync(tenantId, request.Status, cancellationToken);
|
||||
|
||||
if (request.OrderId.HasValue)
|
||||
{
|
||||
payments = payments.Where(x => x.OrderId == request.OrderId.Value).ToList();
|
||||
}
|
||||
|
||||
var sorted = ApplySorting(payments, request.SortBy, request.SortDescending);
|
||||
var paged = sorted
|
||||
.Skip((request.Page - 1) * request.PageSize)
|
||||
.Take(request.PageSize)
|
||||
.ToList();
|
||||
|
||||
var items = paged.Select(payment => new PaymentDto
|
||||
{
|
||||
Id = payment.Id,
|
||||
TenantId = payment.TenantId,
|
||||
OrderId = payment.OrderId,
|
||||
Method = payment.Method,
|
||||
Status = payment.Status,
|
||||
Amount = payment.Amount,
|
||||
TradeNo = payment.TradeNo,
|
||||
ChannelTransactionId = payment.ChannelTransactionId,
|
||||
PaidAt = payment.PaidAt,
|
||||
Remark = payment.Remark,
|
||||
Payload = payment.Payload,
|
||||
CreatedAt = payment.CreatedAt
|
||||
}).ToList();
|
||||
|
||||
return new PagedResult<PaymentDto>(items, request.Page, request.PageSize, payments.Count);
|
||||
}
|
||||
|
||||
private static IOrderedEnumerable<Domain.Payments.Entities.PaymentRecord> ApplySorting(
|
||||
IReadOnlyCollection<Domain.Payments.Entities.PaymentRecord> payments,
|
||||
string? sortBy,
|
||||
bool sortDescending)
|
||||
{
|
||||
return sortBy?.ToLowerInvariant() switch
|
||||
{
|
||||
"paidat" => sortDescending ? payments.OrderByDescending(x => x.PaidAt) : payments.OrderBy(x => x.PaidAt),
|
||||
"status" => sortDescending ? payments.OrderByDescending(x => x.Status) : payments.OrderBy(x => x.Status),
|
||||
"amount" => sortDescending ? payments.OrderByDescending(x => x.Amount) : payments.OrderBy(x => x.Amount),
|
||||
_ => sortDescending ? payments.OrderByDescending(x => x.CreatedAt) : payments.OrderBy(x => x.CreatedAt)
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
using MediatR;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using TakeoutSaaS.Application.App.Payments.Commands;
|
||||
using TakeoutSaaS.Application.App.Payments.Dto;
|
||||
using TakeoutSaaS.Domain.Payments.Entities;
|
||||
using TakeoutSaaS.Domain.Payments.Repositories;
|
||||
using TakeoutSaaS.Shared.Abstractions.Tenancy;
|
||||
|
||||
namespace TakeoutSaaS.Application.App.Payments.Handlers;
|
||||
|
||||
/// <summary>
|
||||
/// 更新支付记录命令处理器。
|
||||
/// </summary>
|
||||
public sealed class UpdatePaymentCommandHandler(
|
||||
IPaymentRepository paymentRepository,
|
||||
ITenantProvider tenantProvider,
|
||||
ILogger<UpdatePaymentCommandHandler> logger)
|
||||
: IRequestHandler<UpdatePaymentCommand, PaymentDto?>
|
||||
{
|
||||
private readonly IPaymentRepository _paymentRepository = paymentRepository;
|
||||
private readonly ITenantProvider _tenantProvider = tenantProvider;
|
||||
private readonly ILogger<UpdatePaymentCommandHandler> _logger = logger;
|
||||
|
||||
/// <inheritdoc />
|
||||
public async Task<PaymentDto?> Handle(UpdatePaymentCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
var tenantId = _tenantProvider.GetCurrentTenantId();
|
||||
var existing = await _paymentRepository.FindByIdAsync(request.PaymentId, tenantId, cancellationToken);
|
||||
if (existing == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
existing.OrderId = request.OrderId;
|
||||
existing.Method = request.Method;
|
||||
existing.Status = request.Status;
|
||||
existing.Amount = request.Amount;
|
||||
existing.TradeNo = request.TradeNo?.Trim();
|
||||
existing.ChannelTransactionId = request.ChannelTransactionId?.Trim();
|
||||
existing.PaidAt = request.PaidAt;
|
||||
existing.Remark = request.Remark?.Trim();
|
||||
existing.Payload = request.Payload;
|
||||
|
||||
await _paymentRepository.UpdatePaymentAsync(existing, cancellationToken);
|
||||
await _paymentRepository.SaveChangesAsync(cancellationToken);
|
||||
_logger.LogInformation("更新支付记录 {PaymentId}", existing.Id);
|
||||
|
||||
var refunds = await _paymentRepository.GetRefundsAsync(existing.Id, tenantId, cancellationToken);
|
||||
return MapToDto(existing, refunds);
|
||||
}
|
||||
|
||||
private static PaymentDto MapToDto(PaymentRecord payment, IReadOnlyList<PaymentRefundRecord> refunds) => new()
|
||||
{
|
||||
Id = payment.Id,
|
||||
TenantId = payment.TenantId,
|
||||
OrderId = payment.OrderId,
|
||||
Method = payment.Method,
|
||||
Status = payment.Status,
|
||||
Amount = payment.Amount,
|
||||
TradeNo = payment.TradeNo,
|
||||
ChannelTransactionId = payment.ChannelTransactionId,
|
||||
PaidAt = payment.PaidAt,
|
||||
Remark = payment.Remark,
|
||||
Payload = payment.Payload,
|
||||
CreatedAt = payment.CreatedAt,
|
||||
Refunds = refunds.Select(x => new PaymentRefundDto
|
||||
{
|
||||
Id = x.Id,
|
||||
PaymentRecordId = x.PaymentRecordId,
|
||||
OrderId = x.OrderId,
|
||||
Amount = x.Amount,
|
||||
ChannelRefundId = x.ChannelRefundId,
|
||||
Status = x.Status,
|
||||
Payload = x.Payload
|
||||
}).ToList()
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user