From 0846b628ebd2e657a7fb070df41569d38556a476 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 10 四月 2025 10:56:26 +0800
Subject: [PATCH] fix: ACOOLYNotify 回调状态修改

---
 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs |   18 ++++++++++++++++++
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs     |    2 +-
 2 files changed, 19 insertions(+), 1 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index d4f8f67..5a4b83b 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1389,7 +1389,7 @@
         var order = await _lifePayOrderRepository.Where(x => x.OrderNo == orderNo).FirstOrDefaultAsync();
         CheckExtensions.IfTrueThrowUserFriendlyException(order == null, "璁㈠崟涓嶅瓨鍦�");
 
-        if (order.LifePayOrderStatus >= LifePayOrderStatusEnum.宸插畬鎴�)
+        if (order.LifePayOrderStatus == LifePayOrderStatusEnum.宸插畬鎴�)
         {
             return;
         }
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 313aea7..bd6e839 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -111,6 +111,12 @@
                         status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
+                    else
+                    if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+                    {
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
+                        acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+                    }
                     break;
                 case ACOOLYConstant.Sevice.ConfirmPhoneOrder:
                     var confirmPhoneOrderResponse = JsonConvert.DeserializeObject<ConfirmPhoneOrderResponse>(body);
@@ -162,6 +168,12 @@
                         status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
+                    else
+                    if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+                    {
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
+                        acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+                    }
                     break;
                 case ACOOLYConstant.Sevice.ConfirmGasOrder:
                     var confirmGasOrderResponse = JsonConvert.DeserializeObject<ConfirmGasOrderResponse>(body);
@@ -213,6 +225,12 @@
                         status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
+                    else
+                    if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+                    {
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
+                        acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+                    }
                     break;
                 default:
                     throw new UserFriendlyException("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬩笉瀛樺湪");

--
Gitblit v1.9.1