From e80d0c59be1dd43fa5ce8c89ebc57764f091b2ae Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 18:36:34 +0800
Subject: [PATCH] fix:退款bug

---
 LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs |   36 ++++++++++++++++++------------------
 1 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 7e2b32e..82e8728 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -52,10 +52,11 @@
             }
             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;
+            string refundApplyRemark = string.Empty;
             _logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬶細" + baseInfo.Service);
             _logger.LogError("ACOOLY鍥炶皟鍐呭锛�" + body);
             switch (baseInfo.Service)
@@ -70,28 +71,27 @@
                     if (!confirmElectricOrderResponse.Success
                     || (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
-
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
                     {
                         status = LifePayOrderStatusEnum.宸插畬鎴�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
                     }
                     else
-
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
                     {
-                        status = LifePayOrderStatusEnum.寰呯‘璁�;
+                        status = LifePayOrderStatusEnum.鍏呭�间腑;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
                     }
                     else
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+                        refundApplyRemark = "渚涘簲鍟嗗厖鍊煎け璐�";
                     }
                     else
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
@@ -108,7 +108,7 @@
                     else
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;
@@ -121,7 +121,7 @@
                     if (!confirmPhoneOrderResponse.Success
                      || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -135,13 +135,13 @@
 
                      if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
                     {
-                        status = LifePayOrderStatusEnum.寰呯‘璁�;
+                        status = LifePayOrderStatusEnum.鍏呭�间腑;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
                     }
                     else
                      if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -159,7 +159,7 @@
                     else
                      if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;
@@ -172,7 +172,7 @@
                     if (!confirmGasOrderResponse.Success
                      || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -186,13 +186,13 @@
 
                      if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
                     {
-                        status = LifePayOrderStatusEnum.寰呯‘璁�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
                     }
                     else
                      if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -210,15 +210,15 @@
                     else
                      if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;
                 default:
-                    break;
+                    throw new UserFriendlyException("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬩笉瀛樺湪");
             }
 
-            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);
+            await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark);
         }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1