From ca6b1e43b46324066d20a38a0a767634a534c1c3 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 09 六月 2025 09:24:10 +0800
Subject: [PATCH] Merge branch 'dev-1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-1.3
---
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 379bf86..dbbcb41 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1381,7 +1381,7 @@
return;
}
- // order.PlatformDeductionAmount = payAmount;
+ //order.PlatformDeductionAmount = payAmount;
if (acoolyOrderNo.IsNotNullOrEmpty())
{
@@ -1400,7 +1400,12 @@
order.LifePayOrderStatus = status;
order.ACOOLYStatus = acoolyStatus;
- order.FinishTime = DateTime.Now;
+ if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�
+ || order.LifePayOrderStatus == LifePayOrderStatusEnum.宸查��娆�)
+ {
+ order.FinishTime = DateTime.Now;
+ }
+
await _lifePayOrderRepository.UpdateAsync(order);
if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
--
Gitblit v1.9.1