From 1c5d47ed2fb8e2dac617676ac1f489cc6e3483af Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期一, 09 六月 2025 10:21:29 +0800
Subject: [PATCH] feat:1.4相关修改

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 379bf86..0aef80f 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1376,12 +1376,12 @@
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
-        {
-            return;
-        }
+        //if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
+        //{
+        //    return;
+        //}
 
-        // order.PlatformDeductionAmount = payAmount;
+        order.ActualReceivedAmount = actualParValue;
 
         if (acoolyOrderNo.IsNotNullOrEmpty())
         {
@@ -1400,7 +1400,14 @@
 
         order.LifePayOrderStatus = status;
         order.ACOOLYStatus = acoolyStatus;
-        order.FinishTime = DateTime.Now;
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�
+            || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+        {
+            order.FinishTime = DateTime.Now;
+            order.PlatformDeductionAmount = order.ActualReceivedAmount * order.PlatformRate / 100;
+            order.RefundPrice = Math.Round((1 - ((order.ActualReceivedAmount ?? 0) / (order.RechargeAmount ?? 0))) * (order.PayAmount ?? 0), 2);
+        }
+
         await _lifePayOrderRepository.UpdateAsync(order);
 
         if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)

--
Gitblit v1.9.1