diff --git a/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsQueryHandler.cs b/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsQueryHandler.cs index 4f36533..15f3193 100644 --- a/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsQueryHandler.cs +++ b/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsQueryHandler.cs @@ -44,8 +44,7 @@ public class GetMyCommissionPayoutsQueryHandler : IRequestHandler "Pending", - 1 => "Calculated", - 2 => "Paid", - 3 => "Withdrawn", - _ => "Unknown" - }; - } - - private static string GetStatusColor(int status) - { - return status switch - { - 0 => "warning", - 1 => "info", - 2 => "success", - 3 => "success", - _ => "default" - }; - } - private static string FormatCurrency(long amount) { return $"{amount:N0} تومان"; diff --git a/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsResponseDto.cs b/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsResponseDto.cs index fae5b3d..2f84090 100644 --- a/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsResponseDto.cs +++ b/src/FrontOffice.BFF.Application/CommissionCQ/Queries/GetMyCommissionPayouts/GetMyCommissionPayoutsResponseDto.cs @@ -41,14 +41,9 @@ public class CommissionPayoutDto public string AmountFormatted { get; set; } = string.Empty; /// - /// وضعیت (Pending/Calculated/Paid/Withdrawn) + /// وضعیت (0=Pending=1,Paid=2,WithdrawRequested=3,Withdrawn=4,PaymentFailed= 5,Cancelled) /// - public string Status { get; set; } = string.Empty; - - /// - /// رنگ Badge - /// - public string StatusBadgeColor { get; set; } = string.Empty; + public int Status { get; set; } /// /// تاریخ محاسبه diff --git a/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs b/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs index df2a9eb..1079037 100644 --- a/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs +++ b/src/FrontOffice.BFF.WebApi/Common/Mappings/CommissionProfile.cs @@ -36,7 +36,6 @@ public class CommissionProfile : IRegister .Map(dest => dest.TotalAmount, src => src.TotalAmount) .Map(dest => dest.AmountFormatted, src => src.AmountFormatted) .Map(dest => dest.Status, src => src.Status) - .Map(dest => dest.StatusBadgeColor, src => src.StatusBadgeColor) .Map(dest => dest.CalculatedDate, src => Timestamp.FromDateTime(DateTime.SpecifyKind(src.CalculatedDate, DateTimeKind.Utc))) .Map(dest => dest.DatePersian, src => src.DatePersian); diff --git a/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/FrontOffice.BFF.Commission.Protobuf.csproj b/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/FrontOffice.BFF.Commission.Protobuf.csproj index 2412af6..794b0a0 100644 --- a/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/FrontOffice.BFF.Commission.Protobuf.csproj +++ b/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/FrontOffice.BFF.Commission.Protobuf.csproj @@ -3,7 +3,7 @@ net9.0 enable enable - 0.0.3 + 0.0.4 Foursat.FrontOffice.BFF.Commission.Protobuf False False diff --git a/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/Protos/commission.proto b/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/Protos/commission.proto index dd5cec1..586f136 100644 --- a/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/Protos/commission.proto +++ b/src/Protobufs/FrontOffice.BFF.Commission.Protobuf/Protos/commission.proto @@ -63,10 +63,9 @@ message CommissionPayoutModel int32 balances_earned = 4; int64 total_amount = 5; string amount_formatted = 6; - string status = 7; - string status_badge_color = 8; - google.protobuf.Timestamp calculated_date = 9; - string date_persian = 10; + int32 status = 7; // 0=Pending, 1=Paid, 2=WithdrawRequested, 3=Withdrawn, 4=PaymentFailed, 5=Cancelled + google.protobuf.Timestamp calculated_date = 8; + string date_persian = 9; } // ============ GetMyWeeklyBalances ============