Merge branch 'kub-stage' into production
Build and Deploy to Production / build-and-deploy (push) Failing after 2m40s
Build and Deploy to Production / build-and-deploy (push) Failing after 2m40s
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
@using Blazored.LocalStorage
|
||||
@using CMSMicroservice.Protobuf.Protos.Package
|
||||
@using CMSMicroservice.Protobuf.Protos.User
|
||||
@inject IJSRuntime JS
|
||||
@using FrontOffice.Main.Utilities
|
||||
|
||||
|
||||
<PageTitle>نتیجه پرداخت | کارا بازار سلامت</PageTitle>
|
||||
@@ -21,10 +21,10 @@
|
||||
<MudText Typo="Typo.h5" Color="Color.Success" Class="mt-4">پرداخت موفق</MudText>
|
||||
<MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
|
||||
|
||||
@if (!string.IsNullOrEmpty(_refId))
|
||||
@if (_transactionId > 0)
|
||||
{
|
||||
<MudText Typo="Typo.body2" Class="mt-3">
|
||||
<strong>کد پیگیری:</strong> @_refId
|
||||
<strong>کد ارجاعی:</strong> @_transactionId
|
||||
</MudText>
|
||||
}
|
||||
|
||||
@@ -33,13 +33,10 @@
|
||||
<MudText Typo="Typo.body2" Color="Color.Secondary">
|
||||
موجودی کیف پول اصلی: @FormatPrice(_walletBalance)
|
||||
</MudText>
|
||||
<MudText Typo="Typo.body2" Color="Color.Secondary">
|
||||
موجودی کیف پول اعتباری: @FormatPrice(_discountBalance)
|
||||
</MudText>
|
||||
|
||||
<MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
|
||||
OnClick="GoBack">
|
||||
بازگشت به پروفایل
|
||||
Href="@_successReturnUrl">
|
||||
@_successReturnText
|
||||
</MudButton>
|
||||
}
|
||||
else
|
||||
@@ -49,8 +46,8 @@
|
||||
<MudText Typo="Typo.body1" Class="mt-2">@_message</MudText>
|
||||
|
||||
<MudButton Color="Color.Primary" Variant="Variant.Filled" Class="mt-6"
|
||||
OnClick="GoBack">
|
||||
بازگشت به پروفایل
|
||||
Href="@_failReturnUrl">
|
||||
@_failReturnText
|
||||
</MudButton>
|
||||
|
||||
<MudButton Color="Color.Secondary" Variant="Variant.Outlined" Class="mt-3 mr-2"
|
||||
@@ -64,12 +61,19 @@
|
||||
@code {
|
||||
[Inject] private PackageContract.PackageContractClient PackageContractClient { get; set; } = default!;
|
||||
[Inject] private UserContract.UserContractClient UserContractClient { get; set; } = default!;
|
||||
[Inject] private DiscountOrderService DiscountOrderService { get; set; } = default!;
|
||||
[Inject] private ILocalStorageService LocalStorage { get; set; } = default!;
|
||||
[Inject] private AuthService AuthService { get; set; } = default!;
|
||||
[Inject] private NavigationManager NavManager { get; set; } = default!;
|
||||
|
||||
private const string TokenStorageKey = "auth:token";
|
||||
|
||||
/// <summary>
|
||||
/// نوع پرداخت: package (پیشفرض) | magic-wallet | discount-wallet | discount-order
|
||||
/// </summary>
|
||||
[SupplyParameterFromQuery(Name = "type")]
|
||||
private string? PaymentType { get; set; }
|
||||
|
||||
[SupplyParameterFromQuery(Name = "orderId")]
|
||||
private long OrderId { get; set; }
|
||||
|
||||
@@ -85,9 +89,14 @@
|
||||
private bool _isLoading = true;
|
||||
private bool _isSuccess;
|
||||
private string _message = string.Empty;
|
||||
private string? _refId;
|
||||
private long _transactionId;
|
||||
private long _walletBalance;
|
||||
private long _discountBalance;
|
||||
|
||||
// دکمههای بازگشت بسته به نوع پرداخت
|
||||
private string _successReturnUrl = "/profile";
|
||||
private string _successReturnText = "بازگشت به پروفایل";
|
||||
private string _failReturnUrl = "/profile";
|
||||
private string _failReturnText = "بازگشت به پروفایل";
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
{
|
||||
@@ -101,35 +110,23 @@
|
||||
{
|
||||
try
|
||||
{
|
||||
if (OrderId <= 0 || TransactionId <= 0 || string.IsNullOrEmpty(Authority))
|
||||
{
|
||||
_isSuccess = false;
|
||||
_message = "پارامترهای پرداخت نامعتبر است";
|
||||
_isLoading = false;
|
||||
StateHasChanged();
|
||||
return;
|
||||
}
|
||||
|
||||
var response = await PackageContractClient.VerifyBasePackagePaymentAsync(new VerifyBasePackagePaymentRequest
|
||||
{
|
||||
OrderId = OrderId,
|
||||
TransactionId = TransactionId,
|
||||
PaymentSuccess = Status == "OK",
|
||||
RefId = !string.IsNullOrEmpty(Authority) ? Authority : null,
|
||||
Message = !string.IsNullOrEmpty(Status) ? Status : null
|
||||
});
|
||||
|
||||
_isSuccess = response.Success;
|
||||
_message = response.Message;
|
||||
_refId = response.ReferenceCode ?? "";
|
||||
_walletBalance = response.WalletBalance;
|
||||
_discountBalance = response.DiscountBalance;
|
||||
// تعیین نوع پرداخت — اگر type نباشد، پیشفرض خرید پکیج
|
||||
var type = PaymentType?.ToLowerInvariant() ?? "package";
|
||||
|
||||
// اگر پرداخت موفق بود، توکن را refresh میکنیم
|
||||
// چون PackagePurchaseMethod تغییر کرده و باید در claims جدید باشد
|
||||
if (_isSuccess)
|
||||
switch (type)
|
||||
{
|
||||
await RefreshTokenAsync();
|
||||
case "magic-wallet":
|
||||
await VerifyMagicWalletCharge();
|
||||
break;
|
||||
case "discount-wallet":
|
||||
await VerifyDiscountWalletCharge();
|
||||
break;
|
||||
case "discount-order":
|
||||
await VerifyDiscountOrderPayment();
|
||||
break;
|
||||
default: // "package" or missing
|
||||
await VerifyPackagePurchase();
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -143,10 +140,156 @@
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// تأیید خرید پکیج — رفتار فعلی
|
||||
/// </summary>
|
||||
private async Task VerifyPackagePurchase()
|
||||
{
|
||||
_successReturnUrl = "/profile";
|
||||
_successReturnText = "بازگشت به پروفایل";
|
||||
_failReturnUrl = "/profile";
|
||||
_failReturnText = "بازگشت به پروفایل";
|
||||
|
||||
if (OrderId <= 0 || string.IsNullOrEmpty(Authority))
|
||||
{
|
||||
_isSuccess = false;
|
||||
_message = "پارامترهای پرداخت نامعتبر است";
|
||||
return;
|
||||
}
|
||||
|
||||
var response = await PackageContractClient.CustomerVerifyPackagePurchaseAsync(new CustomerVerifyPackagePurchaseRequest
|
||||
{
|
||||
OrderId = OrderId,
|
||||
Authority = Authority ?? string.Empty,
|
||||
Status = Status ?? string.Empty
|
||||
});
|
||||
|
||||
_isSuccess = response.Success;
|
||||
_message = response.Message;
|
||||
_transactionId = response.TransactionId;
|
||||
|
||||
if (_isSuccess)
|
||||
{
|
||||
await UpdateWalletBalanceAndRefreshToken();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// تأیید شارژ کیفپول جادویی
|
||||
/// </summary>
|
||||
private async Task VerifyMagicWalletCharge()
|
||||
{
|
||||
_successReturnUrl = "/profile/magic-wallet";
|
||||
_successReturnText = "بازگشت به کیف پول جادویی";
|
||||
_failReturnUrl = "/profile/magic-wallet";
|
||||
_failReturnText = "بازگشت به کیف پول جادویی";
|
||||
|
||||
if (string.IsNullOrEmpty(Authority))
|
||||
{
|
||||
_isSuccess = false;
|
||||
_message = "کد Authority نامعتبر است";
|
||||
return;
|
||||
}
|
||||
|
||||
var (success, message) = await WalletService.VerifyMagicChargeAsync(
|
||||
Authority, Status ?? "NOK");
|
||||
|
||||
_isSuccess = success;
|
||||
_message = message;
|
||||
|
||||
if (_isSuccess)
|
||||
{
|
||||
await UpdateWalletBalance();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// تأیید شارژ کیف پول تخفیفی
|
||||
/// </summary>
|
||||
private async Task VerifyDiscountWalletCharge()
|
||||
{
|
||||
_successReturnUrl = "/profile/charge-discount-wallet";
|
||||
_successReturnText = "بازگشت به کیف پول تخفیفی";
|
||||
_failReturnUrl = "/profile/charge-discount-wallet";
|
||||
_failReturnText = "بازگشت به کیف پول تخفیفی";
|
||||
|
||||
if (string.IsNullOrEmpty(Authority))
|
||||
{
|
||||
_isSuccess = false;
|
||||
_message = "کد Authority نامعتبر است";
|
||||
return;
|
||||
}
|
||||
|
||||
var (success, message) = await WalletService.VerifyDiscountChargeAsync(
|
||||
Authority, Status ?? "NOK");
|
||||
|
||||
_isSuccess = success;
|
||||
_message = message;
|
||||
|
||||
if (_isSuccess)
|
||||
{
|
||||
await UpdateWalletBalance();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// تأیید پرداخت سفارش فروشگاه تخفیفی
|
||||
/// </summary>
|
||||
private async Task VerifyDiscountOrderPayment()
|
||||
{
|
||||
_successReturnUrl = $"/discount-store/order/{OrderId}";
|
||||
_successReturnText = "مشاهده سفارش";
|
||||
_failReturnUrl = $"/discount-store/order/{OrderId}";
|
||||
_failReturnText = "مشاهده سفارش";
|
||||
|
||||
if (OrderId <= 0 || string.IsNullOrEmpty(Authority))
|
||||
{
|
||||
_isSuccess = false;
|
||||
_message = "پارامترهای پرداخت نامعتبر است";
|
||||
return;
|
||||
}
|
||||
|
||||
var (success, message, _) = await DiscountOrderService.VerifyDiscountOrderPaymentAsync(
|
||||
OrderId, Authority, Status ?? "NOK");
|
||||
|
||||
_isSuccess = success;
|
||||
_message = message;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// بروزرسانی موجودی کیف پول
|
||||
/// </summary>
|
||||
private async Task UpdateWalletBalance()
|
||||
{
|
||||
try
|
||||
{
|
||||
var balances = await WalletService.GetBalancesAsync();
|
||||
_walletBalance = balances.CreditBalance;
|
||||
}
|
||||
catch { /* اگر خطا شد، صفر نمایش بده */ }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// بروزرسانی موجودی + refresh توکن (فقط برای خرید پکیج)
|
||||
/// </summary>
|
||||
private async Task UpdateWalletBalanceAndRefreshToken()
|
||||
{
|
||||
await UpdateWalletBalance();
|
||||
await RefreshTokenAsync();
|
||||
}
|
||||
|
||||
private void RetryPayment()
|
||||
{
|
||||
NavManager.NavigateTo("/profile");
|
||||
var type = PaymentType?.ToLowerInvariant() ?? "package";
|
||||
var url = type switch
|
||||
{
|
||||
"magic-wallet" => "/profile/magic-wallet",
|
||||
"discount-wallet" => "/profile/charge-discount-wallet",
|
||||
"discount-order" => "/discount-store",
|
||||
_ => "/profile"
|
||||
};
|
||||
NavManager.NavigateTo(url, forceLoad: true);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -174,6 +317,4 @@
|
||||
}
|
||||
|
||||
private static string FormatPrice(long price) => string.Format("{0:N0} تومان", price);
|
||||
|
||||
private async Task GoBack() => await JS.InvokeVoidAsync("history.back");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user