From 4cb523bee320f335100c63df4c8f51ed09fca9eb Mon Sep 17 00:00:00 2001
From: lingling <kety1122@163.com>
Date: 星期四, 20 三月 2025 16:47:07 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 8e0e2b9..f9c6aca 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -53,7 +53,9 @@
var baseInfo = JsonConvert.DeserializeObject<ACOOLYRequestBaseResponse>(body);
var orderNo = string.Empty;
var status = LifePayOrderStatusEnum.寰呯‘璁�;
+ var acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
var acoolyOrderNo = string.Empty;
+ decimal payAmount = 0;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬶細" + baseInfo.Service);
_logger.LogError("ACOOLY鍥炶皟鍐呭锛�" + body);
switch (baseInfo.Service)
@@ -62,29 +64,33 @@
var confirmElectricOrderResponse = JsonConvert.DeserializeObject<ConfirmElectricOrderResponse>(body);
orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
+ payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmElectricOrderResponse.ElectricChargeOrder.Status);
- /// TODO 鐘舵�佷笉姝ｇ‘
if (!confirmElectricOrderResponse.Success
|| (confirmElectricOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmElectricOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
- if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.SUCCESS)
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
}
else
- if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Code.PROCESSING)
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
status = LifePayOrderStatusEnum.寰呯‘璁�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
{
status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
break;
@@ -92,35 +98,81 @@
var confirmPhoneOrderResponse = JsonConvert.DeserializeObject<ConfirmPhoneOrderResponse>(body);
orderNo = confirmPhoneOrderResponse.PhoneChargeOrder.OutOrderNo;
acoolyOrderNo = confirmPhoneOrderResponse.PhoneChargeOrder.BusiOrderNo;
+ payAmount = confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmPhoneOrderResponse.PhoneChargeOrder.Status);
if (!confirmPhoneOrderResponse.Success
|| (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
- if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.SUCCESS)
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
}
else
- if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Code.PROCESSING)
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
status = LifePayOrderStatusEnum.寰呯‘璁�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
{
status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
break;
+ case ACOOLYConstant.Sevice.ConfirmGasOrder:
+ var confirmGasOrderResponse = JsonConvert.DeserializeObject<ConfirmGasOrderResponse>(body);
+ orderNo = confirmGasOrderResponse.GasChargeOrder.OutOrderNo;
+ acoolyOrderNo = confirmGasOrderResponse.GasChargeOrder.BusiOrderNo;
+ payAmount = confirmGasOrderResponse.GasChargeOrder.PayAmount;
+ _logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmGasOrderResponse.GasChargeOrder.Status);
+ if (!confirmGasOrderResponse.Success
+ || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
+ {
+ status = LifePayOrderStatusEnum.宸插け璐�;
+ }
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ // TODO 纭浠�涔堟儏鍐典笅鍙互鍒ゆ柇鏄儴鍒嗗厖鍊兼垚鍔�
+
+ //if (confirmGasOrderResponse.GasChargeOrder.ParValue == confirmGasOrderResponse.GasChargeOrder.PayAmount)
+ //{
+
+ // acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
+ //}
+ //else
+ //{
+ // acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+ //}
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
+ }
+ else
+
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
+ {
+ status = LifePayOrderStatusEnum.寰呯‘璁�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
+ }
+ else
+ {
+ status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ break;
default:
break;
}
- await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status);
+ await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1