From a22995ea9ded904780c27319510a82275a972cab Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 21 三月 2025 17:55:17 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

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

diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index df58574..8c2b4be 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -52,7 +52,7 @@
             }
             var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
             var orderNo = string.Empty;
-            LifePayOrderStatusEnum status = LifePayOrderStatusEnum.宸插け璐�;
+            LifePayOrderStatusEnum status = LifePayOrderStatusEnum.寰呴��娆�;
             ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
             var acoolyOrderNo = string.Empty;
             decimal payAmount = 0;
@@ -70,7 +70,7 @@
                     if (!confirmElectricOrderResponse.Success
                     || (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -82,13 +82,13 @@
                     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.鍏呭�煎け璐�;
                     }
                     else
@@ -106,7 +106,7 @@
                     else
                     if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;
@@ -119,7 +119,7 @@
                     if (!confirmPhoneOrderResponse.Success
                      || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -133,13 +133,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
@@ -157,7 +157,7 @@
                     else
                      if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;
@@ -170,7 +170,7 @@
                     if (!confirmGasOrderResponse.Success
                      || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     else
@@ -184,13 +184,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
@@ -208,7 +208,7 @@
                     else
                      if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
                     {
-                        status = LifePayOrderStatusEnum.宸插け璐�;
+                        status = LifePayOrderStatusEnum.寰呴��娆�;
                         acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
                     }
                     break;

--
Gitblit v1.9.1