From 0a6ddcc8360063c8138965b69baf1fb563f6a0d8 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 20 五月 2025 10:58:45 +0800
Subject: [PATCH] build:.gitignore添加../.vs/
---
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index 313aea7..b7dd3a4 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -56,6 +56,8 @@
ACOOLYStatusEnum acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
var acoolyOrderNo = string.Empty;
decimal payAmount = 0;
+ decimal parValue = 0;
+ decimal actualParValue = 0;
string refundApplyRemark = string.Empty;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬶細" + baseInfo.Service);
_logger.LogError("ACOOLY鍥炶皟鍐呭锛�" + body);
@@ -66,6 +68,8 @@
orderNo = confirmElectricOrderResponse.ElectricChargeOrder.OutOrderNo;
acoolyOrderNo = confirmElectricOrderResponse.ElectricChargeOrder.BusiOrderNo;
payAmount = confirmElectricOrderResponse.ElectricChargeOrder.PayAmount;
+ actualParValue = confirmElectricOrderResponse.ElectricChargeOrder.ActualParValue;
+ parValue = confirmElectricOrderResponse.ElectricChargeOrder.ParValue;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmElectricOrderResponse.ElectricChargeOrder.Status);
if (!confirmElectricOrderResponse.Success
@@ -110,6 +114,13 @@
{
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ else
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.寰呴��娆�;
+ acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+ refundApplyRemark = confirmElectricOrderResponse.ElectricChargeOrder.ResponseMessage;
}
break;
case ACOOLYConstant.Sevice.ConfirmPhoneOrder:
@@ -162,6 +173,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,12 +230,18 @@
status = LifePayOrderStatusEnum.寰呴��娆�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閮ㄥ垎鍏呭�兼垚鍔�)
+ {
+ status = LifePayOrderStatusEnum.寰呴��娆�;
+ acoolyStatus = ACOOLYStatusEnum.閮ㄥ垎鍏呭�兼垚鍔�;
+ }
break;
default:
throw new UserFriendlyException("ACOOLY鍥炶皟閫氬鐞嗙被鍨嬩笉瀛樺湪");
}
- await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark);
+ await _lifePayService.ACOOLYOrderNotifyHandler(orderNo, acoolyOrderNo, status, acoolyStatus, payAmount, refundApplyRemark, parValue, actualParValue);
}
}
}
\ No newline at end of file
--
Gitblit v1.9.1