From 8b923699a5ff894ca839b4b5ce79979d5dd20459 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 13:26:18 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs | 4 ++--
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 17 +++++++++++++++++
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 10 ++++++++++
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 5 +++++
LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml | 2 +-
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 5 ++++-
LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs | 4 ++++
7 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 563d90e..809c19b 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -246,6 +246,12 @@
/// </summary>
public string RefundApplyRemark { get; set; }
+
+ /// <summary>
+ /// 閫�娆剧敵璇锋椂闂�
+ /// </summary>
+ public DateTime? RefundApplyTime { get; set; }
+
/// <summary>
/// 椹冲洖鍘熷洜
/// </summary>
@@ -615,6 +621,11 @@
/// 骞冲彴鍒╂鼎
/// </summary>
public decimal? Profit { get; set; }
+
+ /// <summary>
+ /// 鍥炲崟鍦板潃
+ /// </summary>
+ public string? ElecBillUrl { get; set; }
}
public class LifePayRefundOrderOutput
{
@@ -740,6 +751,12 @@
/// 閫�娆鹃噾棰�
/// </summary>
public decimal? RefundPrice { get; set; }
+
+
+ /// <summary>
+ /// 鍥炲崟鍦板潃
+ /// </summary>
+ public string? ElecBillUrl { get; set; }
}
public class CreateLifePayOrderOutput
{
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 8005a7d..4cf07aa 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -358,6 +358,7 @@
CreationTime = a.CreationTime,
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
+ RefundApplyTime = a.RefundApplyTime,
RefundTime = a.RefundTime,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.ActualRechargeAmount,
@@ -408,6 +409,7 @@
RefundPrice = order.RefundPrice,
PlatformRate = platformRate.Rate,
PlatformPrice = order.PlatformDeductionAmount,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
ChannleRate = channle.ChannlesRate,
ChannlesRakeRate = channle.ChannlesRakeRate,
ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
@@ -457,6 +459,7 @@
LifePayRefundStatus = order.LifePayRefundStatus,
ActualRechargeAmount = order.ActualRechargeAmount,
RefundPrice = order.RefundPrice,
+ ElecBillUrl = order.ElecBillUrl.GetOssPath(),
};
return result;
@@ -737,7 +740,7 @@
var elecInfoInput = new DataBillErceiptApplyInput
{
Type = "FUND_DETAIL",
- Key = orderNo
+ Key = order.OutOrderNo
};
var elecInfoOutput = await _alipayInterfaceManager.DataBillErceiptApply(elecInfoInput);
diff --git a/LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs b/LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs
index 482b9fe..d4a5d6d 100644
--- a/LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs
+++ b/LifePayment/LifePayment.Domain/Ali/AlipayApiConstant.cs
@@ -23,8 +23,8 @@
//internal const string FundBatchDetailQuery = "alipay.fund.batch.detail.query";
//internal const string FundBatchOrderChanged = "alipay.fund.batch.order.changed";
//internal const string FundAccountQuery = "alipay.fund.account.query";
- internal const string DataBillErceiptApply = "alipay.data.bill.ereceiptagent.apply";
- internal const string DataBillEreceiptQuery = "alipay.data.bill.accountbookereceipt.query";
+ internal const string DataBillErceiptApply = "alipay.data.bill.ereceipt.apply";
+ internal const string DataBillEreceiptQuery = "alipay.data.bill.ereceipt.query";
internal const string DataDataserviceBillDownloadUrlQuery = "alipay.data.dataservice.bill.downloadurl.query";
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index fd522ed..cc5fb14 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -151,5 +151,10 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 鍥炲崟鍦板潃
+ /// </summary>
+ public string? ElecBillUrl { get; set; }
}
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
index 7376fcf..dc1a9ed 100644
--- a/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentService.HttpApi.xml
@@ -132,7 +132,7 @@
</member>
<member name="M:LifePayment.HttpApi.LifePayController.GetLifePayRefundOrderPage(LifePayment.Application.Contracts.QueryLifePayRefundOrderListInput)">
<summary>
- 鑾峰彇璁㈠崟鍒嗛〉鏁版嵁
+ 鑾峰彇閫�娆捐鍗曞垎椤垫暟鎹�
</summary>
<param name="input"></param>
<returns></returns>
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index f5b4ebb..9f06faa 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -1045,6 +1045,11 @@
骞冲彴鍒╂鼎
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ElecBillUrl">
+ <summary>
+ 鍥炲崟鍦板潃
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.UserPhoneNumber">
<summary>
鐢ㄦ埛璐﹀彿
@@ -1160,6 +1165,11 @@
閫�娆鹃噾棰�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayRefundOrderOutput.ElecBillUrl">
+ <summary>
+ 鍥炲崟鍦板潃
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.UserLifePayOrderRefundOutput.Id">
<summary>
璁㈠崟缂栧彿
diff --git a/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs b/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
index 28aee15..3d41c9c 100644
--- a/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
+++ b/LifePayment/LifePayment.HttpApi/LifePay/AliPayNotifyController.cs
@@ -58,6 +58,10 @@
await _lifePayService.LifePaySuccessHandler(input.OutTradeNo, input.TradeNo);
}
}
+ else
+ {
+ _logger.LogError($"鐢熸椿绠″鏀粯瀹濆厖鍊煎洖璋冮�氱煡锛氳鍗曞彿寮傚父 "+ input.OutTradeNo);
+ }
return new ContentResult
{
--
Gitblit v1.9.1