admin/CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'newmain'

Browse Source
This commit is contained in:
masoodafar-web
2025-11-12 02:27:26 +03:30
parent b27c765731
commit 4b8a1dc03c
4 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterQuery.cs
View File

@@ -10,20 +10,20 @@ public record GetAllUserOrderByFilterQuery : IRequest<GetAllUserOrderByFilterRes
}public class GetAllUserOrderByFilterFilter }public class GetAllUserOrderByFilterFilter
{ {
//شناسه //شناسه
public long? Id { get; set; } public long? Id { get; set; }
//قیمت //قیمت
public long? Price { get; set; } public long? Price { get; set; }
//شناسه پکیج //شناسه پکیج
public long? PackageId { get; set; } public long? PackageId { get; set; }
//شناسه تراکنش //شناسه تراکنش
public long? TransactionId { get; set; } public long? TransactionId { get; set; }
//وضعیت پرداخت //وضعیت پرداخت
public bool? PaymentStatus { get; set; } public int? PaymentStatus { get; set; }
//تاریخ پرداخت //تاریخ پرداخت
public DateTime? PaymentDate { get; set; } public DateTime? PaymentDate { get; set; }
//شناسه کاربر //شناسه کاربر
public long? UserId { get; set; } public long? UserId { get; set; }
//شناسه آدرس کاربر //شناسه آدرس کاربر
public long? UserAddressId { get; set; } public long? UserAddressId { get; set; }
} }

18
src/CMSMicroservice.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs
View File

@@ -8,20 +8,20 @@ public class GetAllUserOrderByFilterResponseDto
}public class GetAllUserOrderByFilterResponseModel }public class GetAllUserOrderByFilterResponseModel
{ {
//شناسه //شناسه
public long Id { get; set; } public long Id { get; set; }
//قیمت //قیمت
public long Price { get; set; } public long Price { get; set; }
//شناسه پکیج //شناسه پکیج
public long PackageId { get; set; } public long PackageId { get; set; }
//شناسه تراکنش //شناسه تراکنش
public long? TransactionId { get; set; } public long? TransactionId { get; set; }
//وضعیت پرداخت //وضعیت پرداخت
public bool PaymentStatus { get; set; } public int PaymentStatus { get; set; }
//تاریخ پرداخت //تاریخ پرداخت
public DateTime? PaymentDate { get; set; } public DateTime? PaymentDate { get; set; }
//شناسه کاربر //شناسه کاربر
public long UserId { get; set; } public long UserId { get; set; }
//شناسه آدرس کاربر //شناسه آدرس کاربر
public long UserAddressId { get; set; } public long UserAddressId { get; set; }
} }

4
src/CMSMicroservice.Protobuf/Protos/userorder.proto
View File

@@ -100,7 +100,7 @@ message GetAllUserOrderByFilterFilter
google.protobuf.Int64Value price = 2; google.protobuf.Int64Value price = 2;
google.protobuf.Int64Value package_id = 3; google.protobuf.Int64Value package_id = 3;
google.protobuf.Int64Value transaction_id = 4; google.protobuf.Int64Value transaction_id = 4;
google.protobuf.BoolValue payment_status = 5; google.protobuf.Int32Value payment_status = 5;
google.protobuf.Timestamp payment_date = 6; google.protobuf.Timestamp payment_date = 6;
google.protobuf.Int64Value user_id = 7; google.protobuf.Int64Value user_id = 7;
google.protobuf.Int64Value user_address_id = 8; google.protobuf.Int64Value user_address_id = 8;
@@ -116,7 +116,7 @@ message GetAllUserOrderByFilterResponseModel
int64 price = 2; int64 price = 2;
int64 package_id = 3; int64 package_id = 3;
google.protobuf.Int64Value transaction_id = 4; google.protobuf.Int64Value transaction_id = 4;
bool payment_status = 5; int32 payment_status = 5;
google.protobuf.Timestamp payment_date = 6; google.protobuf.Timestamp payment_date = 6;
int64 user_id = 7; int64 user_id = 7;
int64 user_address_id = 8; int64 user_address_id = 8;

3
src/CMSMicroservice.WebApi/Common/Mappings/GeneralMapping.cs
View File

@@ -50,6 +50,9 @@ public class GeneralMapping : IRegister
config.NewConfig<TimeSpan?, Duration>() config.NewConfig<TimeSpan?, Duration>()
.MapWith(src => src.HasValue ? Duration.FromTimeSpan(src.Value) : null); .MapWith(src => src.HasValue ? Duration.FromTimeSpan(src.Value) : null);
config.NewConfig<DateTimeOffset?, DateTime?>()
.MapWith(src => src.HasValue ? src.Value.DateTime : (DateTime?)null);
config.Default config.Default
.UseDestinationValue(member => member.SetterModifier == AccessModifier.None && .UseDestinationValue(member => member.SetterModifier == AccessModifier.None &&
member.Type.IsGenericType && member.Type.IsGenericType &&