From ac97ef5dcede0dfbb933ad63acccb7d6232d8bc6 Mon Sep 17 00:00:00 2001 From: masoodafar-web Date: Tue, 25 Nov 2025 05:03:23 +0330 Subject: [PATCH] =?UTF-8?q?Generator=20Changes=20at=2011/25/2025=205:01:02?= =?UTF-8?q?=E2=80=AFAM=20+03:30?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SubmitShopBuyOrderResponseDto.cs | 34 +------- .../GetAllUserOrderByFilterResponseDto.cs | 25 +++++- .../GetUserOrder/GetUserOrderResponseDto.cs | 26 +++++- .../Protos/userorder.proto | 81 +++++++++++-------- 4 files changed, 96 insertions(+), 70 deletions(-) diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs index 293c7b6..b214523 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Commands/SubmitShopBuyOrder/SubmitShopBuyOrderResponseDto.cs @@ -1,37 +1,7 @@ - - -using FrontOffice.BFF.UserOrder.Protobuf.Protos.UserOrder; - namespace FrontOffice.BFF.Application.UserOrderCQ.Commands.SubmitShopBuyOrder; public class SubmitShopBuyOrderResponseDto { //شناسه - public long OrderId { get; set; } - // - public PaymentStatus PaymentStatus { get; set; } - // - public DateTime? PaymentDate { get; set; } - // - public PaymentMethod? PaymentMethod { get; set; } - // - public string? UserAddressText { get; set; } - // - public long? TotalAmount { get; set; } - // - public List? FactorDetails { get; set; } + public long Id { get; set; } -}public class SubmitShopBuyOrderFactorDetail -{ - //شناسه - public long ProductId { get; set; } - // - public string ProductTitle { get; set; } - // - public string? ProductThumbnailPath { get; set; } - // - public long? UnitPrice { get; set; } - // - public int? Count { get; set; } - // - public long? UnitDiscountPrice { get; set; } -} +} \ No newline at end of file diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs index fb5fa63..ca9ce21 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetAllUserOrderByFilter/GetAllUserOrderByFilterResponseDto.cs @@ -11,17 +11,38 @@ public class GetAllUserOrderByFilterResponseDto //شناسه public long Id { get; set; } //قیمت - public long Price { get; set; } + public long Amount { get; set; } //شناسه پکیج public long PackageId { get; set; } //شناسه تراکنش public long? TransactionId { get; set; } //وضعیت پرداخت - public bool PaymentStatus { get; set; } + public PaymentStatus PaymentStatus { get; set; } //تاریخ پرداخت public DateTime? PaymentDate { get; set; } //شناسه کاربر public long UserId { get; set; } //شناسه آدرس کاربر public long UserAddressId { get; set; } + // + public PaymentMethod? PaymentMethod { get; set; } + // + public string? UserAddressText { get; set; } + // + public List? FactorDetails { get; set; } +} +public class GetAllUserOrderByFilterResponseModelFactorDetail +{ + //شناسه + public long ProductId { get; set; } + // + public string ProductTitle { get; set; } + // + public string? ProductThumbnailPath { get; set; } + // + public long? UnitPrice { get; set; } + // + public int? Count { get; set; } + // + public long? UnitDiscountPrice { get; set; } } diff --git a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs index 5226a3d..620d407 100644 --- a/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs +++ b/src/FrontOffice.BFF.Application/UserOrderCQ/Queries/GetUserOrder/GetUserOrderResponseDto.cs @@ -4,18 +4,38 @@ public class GetUserOrderResponseDto //شناسه public long Id { get; set; } //قیمت - public long Price { get; set; } + public long Amount { get; set; } //شناسه پکیج public long PackageId { get; set; } //شناسه تراکنش public long? TransactionId { get; set; } //وضعیت پرداخت - public bool PaymentStatus { get; set; } + public PaymentStatus PaymentStatus { get; set; } //تاریخ پرداخت public DateTime? PaymentDate { get; set; } //شناسه کاربر public long UserId { get; set; } //شناسه آدرس کاربر public long UserAddressId { get; set; } + // + public PaymentMethod? PaymentMethod { get; set; } + // + public string? UserAddressText { get; set; } + // + public List? FactorDetails { get; set; } -} \ No newline at end of file +}public class GetUserOrderResponseFactorDetail +{ + //شناسه + public long ProductId { get; set; } + // + public string ProductTitle { get; set; } + // + public string? ProductThumbnailPath { get; set; } + // + public long? UnitPrice { get; set; } + // + public int? Count { get; set; } + // + public long? UnitDiscountPrice { get; set; } +} diff --git a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto index 9eb45d2..c65da9d 100644 --- a/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto +++ b/src/Protobufs/FrontOffice.BFF.UserOrder.Protobuf/Protos/userorder.proto @@ -78,13 +78,42 @@ message GetUserOrderRequest message GetUserOrderResponse { int64 id = 1; - int64 price = 2; + int64 amount = 2; int64 package_id = 3; google.protobuf.Int64Value transaction_id = 4; - bool payment_status = 5; + oneof PaymentStatus_item + { + PaymentStatus payment_status = 5; + } google.protobuf.Timestamp payment_date = 6; int64 user_id = 7; int64 user_address_id = 8; + oneof PaymentMethod_item + { + PaymentMethod payment_method = 9; + } + google.protobuf.StringValue user_address_text = 10; + repeated GetUserOrderResponseFactorDetail factor_details = 11; +} +enum PaymentStatus +{ + Success = 0; + Reject = 1; + Pending = 2; +} +enum PaymentMethod +{ + IPG = 0; + Wallet = 1; +} +message GetUserOrderResponseFactorDetail +{ + int64 product_id = 1; + string product_title = 2; + google.protobuf.StringValue product_thumbnail_path = 3; + google.protobuf.Int64Value unit_price = 4; + google.protobuf.Int32Value count = 5; + google.protobuf.Int64Value unit_discount_price = 6; } message GetAllUserOrderByFilterRequest { @@ -111,46 +140,24 @@ message GetAllUserOrderByFilterResponse message GetAllUserOrderByFilterResponseModel { int64 id = 1; - int64 price = 2; + int64 amount = 2; int64 package_id = 3; google.protobuf.Int64Value transaction_id = 4; - bool payment_status = 5; + oneof PaymentStatus_item + { + messages.PaymentStatus payment_status = 5; + } google.protobuf.Timestamp payment_date = 6; int64 user_id = 7; int64 user_address_id = 8; -} -message SubmitShopBuyOrderRequest -{ - int64 total_amount = 1; -} -message SubmitShopBuyOrderResponse -{ - int64 order_id = 1; - oneof PaymentStatus_item - { - PaymentStatus payment_status = 2; - } - google.protobuf.Timestamp payment_date = 3; oneof PaymentMethod_item { - PaymentMethod payment_method = 4; + messages.PaymentMethod payment_method = 9; } - google.protobuf.StringValue user_address_text = 5; - google.protobuf.Int64Value total_amount = 6; - repeated SubmitShopBuyOrderFactorDetail factor_details = 7; + google.protobuf.StringValue user_address_text = 10; + repeated GetAllUserOrderByFilterResponseModelFactorDetail factor_details = 11; } -enum PaymentStatus -{ - Success = 0; - Reject = 1; - Pending = 2; -} -enum PaymentMethod -{ - IPG = 0; - Wallet = 1; -} -message SubmitShopBuyOrderFactorDetail +message GetAllUserOrderByFilterResponseModelFactorDetail { int64 product_id = 1; string product_title = 2; @@ -159,6 +166,14 @@ message SubmitShopBuyOrderFactorDetail google.protobuf.Int32Value count = 5; google.protobuf.Int64Value unit_discount_price = 6; } +message SubmitShopBuyOrderRequest +{ + int64 total_amount = 1; +} +message SubmitShopBuyOrderResponse +{ + int64 id = 1; +} message PaginationState {