From f7b25f51b37f227120690dafb890e5669e632372 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 14:23:46 +0800
Subject: [PATCH] 实际到账金额
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 5 +++++
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 8 +++-----
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 5 +++++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 4 ++--
4 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 809c19b..a5476ae 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -577,6 +577,11 @@
public decimal? ActualRechargeAmount { get; set; }
/// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
/// 閫�娆鹃噾棰�
/// </summary>
public decimal? RefundPrice { get; set; }
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index b109dc8..cfe7f0d 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1235,8 +1235,6 @@
return;
}
- order.LifePayOrderStatus = status;
- order.ACOOLYStatus = acoolyStatus;
order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
@@ -1253,6 +1251,8 @@
order.PayStatus = LifePayStatusEnum.寰呴��娆�;
}
+ order.LifePayOrderStatus = status;
+ order.ACOOLYStatus = acoolyStatus;
await _lifePayOrderRepository.UpdateAsync(order);
}
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index cc5fb14..e82126f 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -148,6 +148,11 @@
public decimal? ActualRechargeAmount { get; set; }
/// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal? ActualReceivedAmount { get; set; }
+
+ /// <summary>
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 7e2b32e..df58574 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -52,8 +52,8 @@
}
var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
var orderNo = string.Empty;
- var status = LifePayOrderStatusEnum.寰呯‘璁�;
- var acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ LifePayOrderStatusEnum status = LifePayOrderStatusEnum.宸插け璐�;
+ ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
var acoolyOrderNo = string.Empty;
decimal payAmount = 0;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬶細" + baseInfo.Service);
@@ -74,14 +74,12 @@
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
-
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
}
else
-
if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
status = LifePayOrderStatusEnum.寰呯‘璁�;
@@ -215,7 +213,7 @@
}
break;
default:
- break;
+ throw new UserFriendlyException("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬩笉瀛樺湪");
}
await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);
--
Gitblit v1.9.1