From 41d5a89660d5d276c06c31670ce483285a7018cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 20 三月 2025 17:14:32 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 1
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 110 +++++++++++++++++++++++++++
LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs | 82 ++++++++++++++++----
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 7 +
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 6 +
5 files changed, 186 insertions(+), 20 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ed35d68..a56a2db 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -703,7 +703,6 @@
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
-
/// <summary>
/// 瀹為檯鍏呭�奸噾棰�
/// </summary>
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index f9fc712..c6e55a9 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -1130,15 +1130,19 @@
{
order.PayStatus = LifePayStatusEnum.宸查��娆�;
order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.宸查��娆�;
}
else if (wxRefundResult.Status == "PROCESSING")
{
order.PayStatus = LifePayStatusEnum.閫�娆句腑;
order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆句腑;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.閫�娆句腑;
}
else
{
- throw new UserFriendlyException("閫�娆惧け璐�");
+ order.PayStatus = LifePayStatusEnum.寰呴��娆�;
+ order.LifePayOrderStatus = LifePayOrderStatusEnum.閫�娆惧け璐�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
}
break;
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index 760101a..ba6111d 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -131,6 +131,13 @@
<param name="orderNo"></param>
<returns></returns>
</member>
+ <member name="M:LifePayment.HttpApi.LifePayController.GetLifePayRefundOrderDetail(System.String)">
+ <summary>
+ 鑾峰彇閫�娆捐鍗曡鎯�
+ </summary>
+ <param name="orderNo"></param>
+ <returns></returns>
+ </member>
<member name="M:LifePayment.HttpApi.LifePayController.GetUserLifePayOrderPage(LifePayment.Application.Contracts.QueryLifePayOrderListInput)">
<summary>
鑾峰彇鎴戠殑璁㈠崟鍒嗛〉鏁版嵁
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 863e3a7..fa1a781 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -830,6 +830,11 @@
娓犻亾娴佹按鍙�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.UserPhoneNumber">
+ <summary>
+ 鐢ㄦ埛璐﹀彿
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.LifePayType">
<summary>
鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -878,6 +883,11 @@
<member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.FinishTime">
<summary>
瀹屾垚鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OutOrderNo">
+ <summary>
+ 澶栭儴璁㈠崟鍙�
</summary>
</member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.OrderParamDetailJsonStr">
@@ -955,6 +965,106 @@
鎵嬬画璐�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.Profit">
+ <summary>
+ 骞冲彴鍒╂鼎
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.UserPhoneNumber">
+ <summary>
+ 鐢ㄦ埛璐﹀彿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayType">
+ <summary>
+ 鐢熸椿缂磋垂鏀粯绫诲瀷
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayOrderType">
+ <summary>
+ 璁㈠崟绫诲瀷
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.OrderNo">
+ <summary>
+ 璁㈠崟鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RechargeAmount">
+ <summary>
+ 鍏呭�奸噾棰�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.DiscountAmount">
+ <summary>
+ 浼樻儬閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayAmount">
+ <summary>
+ 瀹炰粯閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayTime">
+ <summary>
+ 鏀粯鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.PayStatus">
+ <summary>
+ 鏀粯鐘舵��
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayOrderStatus">
+ <summary>
+ 璁㈠崟鐘舵��
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.FinishTime">
+ <summary>
+ 瀹屾垚鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.OutOrderNo">
+ <summary>
+ 澶栭儴璁㈠崟鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.CreationTime">
+ <summary>
+ 涓嬪崟鏃堕棿
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundTime">
+ <summary>
+ 閫�娆炬椂闂�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundCredentialsImgUrl">
+ <summary>
+ 閫�娆惧嚟璇�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ACOOLYOrderNo">
+ <summary>
+ 娓犻亾娴佹按鍙�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.LifePayRefundStatus">
+ <summary>
+ 骞冲彴閫�娆剧姸鎬�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ActualRechargeAmount">
+ <summary>
+ 瀹為檯鍏呭�奸噾棰�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.RefundPrice">
+ <summary>
+ 閫�娆鹃噾棰�
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id">
<summary>
璁㈠崟缂栧彿
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
index f9c6aca..7e2b32e 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/ACOOLYNotifyController.cs
@@ -88,11 +88,29 @@
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
{
status = LifePayOrderStatusEnum.宸插け璐�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
-
+ else
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ }
+ else
+ if (confirmElectricOrderResponse.ElectricChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
+ {
+ 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);
@@ -101,26 +119,45 @@
payAmount = confirmPhoneOrderResponse.PhoneChargeOrder.PayAmount;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmPhoneOrderResponse.PhoneChargeOrder.Status);
if (!confirmPhoneOrderResponse.Success
- || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
+ || (confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmPhoneOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
status = LifePayOrderStatusEnum.宸插け璐�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
- if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
{
status = LifePayOrderStatusEnum.宸插畬鎴�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�兼垚鍔�;
}
else
- if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
status = LifePayOrderStatusEnum.寰呯‘璁�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
+ {
+ status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ else
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ }
+ else
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ }
+ else
+ if (confirmPhoneOrderResponse.PhoneChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
{
status = LifePayOrderStatusEnum.宸插け璐�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
@@ -133,36 +170,45 @@
payAmount = confirmGasOrderResponse.GasChargeOrder.PayAmount;
_logger.LogError("ACOOLY鍥炶皟閫氬鐞嗙粨鏋滅姸鎬侊細" + confirmGasOrderResponse.GasChargeOrder.Status);
if (!confirmGasOrderResponse.Success
- || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
+ || (confirmGasOrderResponse.Code != ACOOLYConstant.Code.SUCCESS && confirmGasOrderResponse.Code != ACOOLYConstant.Code.PROCESSING))
{
status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
}
else
- if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�兼垚鍔�)
+ 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.鍏呭�间腑)
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�间腑)
{
status = LifePayOrderStatusEnum.寰呯‘璁�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�间腑;
}
else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.鍏呭�煎け璐�)
+ {
+ status = LifePayOrderStatusEnum.宸插け璐�;
+ acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
+ }
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閫�娆句腑)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ }
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.閫�娆惧畬鎴�)
+ {
+ status = LifePayOrderStatusEnum.宸插畬鎴�;
+ acoolyStatus = ACOOLYStatusEnum.宸查��娆�;
+ }
+ else
+ if (confirmGasOrderResponse.GasChargeOrder.Status == ACOOLYConstant.Status.澶辫触鍏抽棴)
{
status = LifePayOrderStatusEnum.宸插け璐�;
acoolyStatus = ACOOLYStatusEnum.鍏呭�煎け璐�;
--
Gitblit v1.9.1