Update payment status to enum and refactor update order handler
This commit is contained in:
@@ -14,33 +14,34 @@ public class UpdateUserOrderCommandHandler : IRequestHandler<UpdateUserOrderComm
|
||||
|
||||
public async Task<Unit> Handle(UpdateUserOrderCommand request, CancellationToken cancellationToken)
|
||||
{
|
||||
// ابتدا سفارش فعلی را از CMS میگیریم تا سایر فیلدها (مبلغ، پرداخت و ...) دستنخورده بمانند
|
||||
var current = await _context.UserOrders.GetUserOrderAsync(new GetUserOrderRequest
|
||||
{
|
||||
Id = request.Id
|
||||
}, cancellationToken: cancellationToken);
|
||||
|
||||
if (current is null)
|
||||
return Unit.Value;
|
||||
// // ابتدا سفارش فعلی را از CMS میگیریم تا سایر فیلدها (مبلغ، پرداخت و ...) دستنخورده بمانند
|
||||
// var current = await _context.UserOrders.GetUserOrderAsync(new GetUserOrderRequest
|
||||
// {
|
||||
// Id = request.Id
|
||||
// }, cancellationToken: cancellationToken);
|
||||
//
|
||||
// if (current is null)
|
||||
// return Unit.Value;
|
||||
|
||||
// ساخت درخواست کامل برای UpdateUserOrder در CMS
|
||||
var updateRequest = new UpdateUserOrderRequest
|
||||
{
|
||||
Id = current.Id,
|
||||
Amount = current.Amount,
|
||||
PackageId = current.PackageId,
|
||||
TransactionId = current.TransactionId,
|
||||
PaymentStatus = current.PaymentStatus,
|
||||
PaymentDate = current.PaymentDate,
|
||||
UserId = current.UserId,
|
||||
UserAddressId = current.UserAddressId,
|
||||
PaymentMethod = current.PaymentMethod,
|
||||
DeliveryStatus = (CMSMicroservice.Protobuf.Protos.DeliveryStatus)request.DeliveryStatus,
|
||||
TrackingCode = request.TrackingCode ?? string.Empty,
|
||||
DeliveryDescription = request.DeliveryDescription ?? string.Empty
|
||||
};
|
||||
|
||||
await _context.UserOrders.UpdateUserOrderAsync(updateRequest, cancellationToken: cancellationToken);
|
||||
// var updateRequest = new UpdateUserOrderRequest
|
||||
// {
|
||||
// Id = current.Id,
|
||||
// Amount = current.Amount,
|
||||
// PackageId = current.PackageId,
|
||||
// TransactionId = current.TransactionId,
|
||||
// PaymentStatus = current.PaymentStatus,
|
||||
// PaymentDate = current.PaymentDate,
|
||||
// UserId = current.UserId,
|
||||
// UserAddressId = current.UserAddressId,
|
||||
// PaymentMethod = current.PaymentMethod,
|
||||
//
|
||||
// };
|
||||
var updatingRequest = request.Adapt<UpdateUserOrderRequest>();
|
||||
updatingRequest.DeliveryStatus = (CMSMicroservice.Protobuf.Protos.DeliveryStatus)request.DeliveryStatus;
|
||||
updatingRequest.TrackingCode = request.TrackingCode ?? string.Empty;
|
||||
updatingRequest.DeliveryDescription = request.DeliveryDescription ?? string.Empty;
|
||||
await _context.UserOrders.UpdateUserOrderAsync(updatingRequest, cancellationToken: cancellationToken);
|
||||
|
||||
return Unit.Value;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
using BackOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
|
||||
|
||||
namespace BackOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder;
|
||||
|
||||
public class GetUserOrderResponseDto
|
||||
@@ -11,7 +13,7 @@ public class GetUserOrderResponseDto
|
||||
//شناسه تراکنش
|
||||
public long? TransactionId { get; set; }
|
||||
//وضعیت پرداخت (true برای Success)
|
||||
public bool PaymentStatus { get; set; }
|
||||
public PaymentMethod PaymentStatus { get; set; }
|
||||
//تاریخ پرداخت
|
||||
public DateTime? PaymentDate { get; set; }
|
||||
// روش پرداخت (0=IPG,1=Wallet)
|
||||
|
||||
Reference in New Issue
Block a user