Merge branch 'main' into stage
This commit is contained in:
3941
docs/model.ndm2
3941
docs/model.ndm2
File diff suppressed because it is too large
Load Diff
@@ -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<SubmitShopBuyOrderFactorDetail>? 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; }
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
using FrontOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
|
||||
using MetaData = FrontOffice.BFF.Application.Common.Models.MetaData;
|
||||
|
||||
namespace FrontOffice.BFF.Application.UserOrderCQ.Queries.GetAllUserOrderByFilter;
|
||||
public class GetAllUserOrderByFilterResponseDto
|
||||
{
|
||||
@@ -11,17 +14,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<GetAllUserOrderByFilterResponseModelFactorDetail>? 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; }
|
||||
}
|
||||
|
||||
@@ -1,21 +1,43 @@
|
||||
using FrontOffice.BFF.UserOrder.Protobuf.Protos.UserOrder;
|
||||
|
||||
namespace FrontOffice.BFF.Application.UserOrderCQ.Queries.GetUserOrder;
|
||||
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<GetUserOrderResponseFactorDetail>? FactorDetails { get; set; }
|
||||
|
||||
}
|
||||
}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; }
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<TargetFramework>net9.0</TargetFramework>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<Nullable>enable</Nullable>
|
||||
<Version>0.0.113</Version>
|
||||
<Version>0.0.114</Version>
|
||||
<DebugType>None</DebugType>
|
||||
<DebugSymbols>False</DebugSymbols>
|
||||
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
|
||||
|
||||
@@ -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
|
||||
{
|
||||
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;
|
||||
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
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user