Update payment status handling and add local config comment
This commit is contained in:
@@ -16,7 +16,13 @@ public class UserOrderProfile : IRegister
|
|||||||
PageSize = src.PaginationState.PageSize
|
PageSize = src.PaginationState.PageSize
|
||||||
})
|
})
|
||||||
.Map(dest => dest.SortBy, src => src.SortBy)
|
.Map(dest => dest.SortBy, src => src.SortBy)
|
||||||
.Map(dest => dest.Filter, src => src.Filter == null || IsEmptyFilter(src.Filter) ? null : BuildFilter(src.Filter));
|
.IgnoreIf((src, dest) => src.Filter.DeliveryStatus==null,dest => dest.Filter.DeliveryStatus)
|
||||||
|
.IgnoreIf((src, dest) => src.Filter.PaymentMethod==null,dest => dest.Filter.PaymentMethod)
|
||||||
|
.IgnoreIf((src, dest) => src.Filter.PaymentStatus==null,dest => dest.Filter.PaymentStatus)
|
||||||
|
.Map(dest => dest.Filter, src => src.Filter == null || IsEmptyFilter(src.Filter) ? null : BuildFilter(src.Filter));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static bool IsEmptyFilter(GetAllUserOrderByFilterFilter src)
|
private static bool IsEmptyFilter(GetAllUserOrderByFilterFilter src)
|
||||||
@@ -50,7 +56,7 @@ public class UserOrderProfile : IRegister
|
|||||||
|
|
||||||
if (src.PaymentDate.HasValue)
|
if (src.PaymentDate.HasValue)
|
||||||
{
|
{
|
||||||
filter.PaymentDate = Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Utc));
|
filter.PaymentDate = Timestamp.FromDateTime(DateTime.SpecifyKind(src.PaymentDate.Value, DateTimeKind.Local));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src.UserId.HasValue)
|
if (src.UserId.HasValue)
|
||||||
@@ -58,9 +64,7 @@ public class UserOrderProfile : IRegister
|
|||||||
|
|
||||||
if (src.PaymentStatus.HasValue)
|
if (src.PaymentStatus.HasValue)
|
||||||
{
|
{
|
||||||
filter.PaymentStatus = src.PaymentStatus.Value
|
filter.PaymentStatus = (CMSMicroservice.Protobuf.Protos.PaymentStatus)src.PaymentStatus.Value;
|
||||||
? CMSMicroservice.Protobuf.Protos.PaymentStatus.Success
|
|
||||||
: CMSMicroservice.Protobuf.Protos.PaymentStatus.Reject;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (src.DeliveryStatus.HasValue)
|
if (src.DeliveryStatus.HasValue)
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
|
|||||||
public long? PackageId { get; set; }
|
public long? PackageId { get; set; }
|
||||||
//شناسه تراکنش
|
//شناسه تراکنش
|
||||||
public long? TransactionId { get; set; }
|
public long? TransactionId { get; set; }
|
||||||
//وضعیت پرداخت
|
//وضعیت پرداخت (کد enum PaymentStatus)
|
||||||
public bool? PaymentStatus { get; set; }
|
public int? PaymentStatus { get; set; }
|
||||||
//تاریخ پرداخت
|
//تاریخ پرداخت
|
||||||
public DateTime? PaymentDate { get; set; }
|
public DateTime? PaymentDate { get; set; }
|
||||||
//شناسه کاربر
|
//شناسه کاربر
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
"GrpcChannelOptions": {
|
"GrpcChannelOptions": {
|
||||||
"FMSMSAddress": "https://dl.afrino.co",
|
"FMSMSAddress": "https://dl.afrino.co",
|
||||||
"CMSMSAddress": "https://cms.kbs1.ir"
|
"CMSMSAddress": "https://cms.kbs1.ir"
|
||||||
|
// "CMSMSAddress": "https://localhost:32846"
|
||||||
},
|
},
|
||||||
"Authentication": {
|
"Authentication": {
|
||||||
"Authority": "https://ids.domain.com/",
|
"Authority": "https://ids.domain.com/",
|
||||||
|
|||||||
Reference in New Issue
Block a user