From d699bedade1d20e5f36bb09ba73e0a8b7c62e014 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期五, 21 三月 2025 14:30:45 +0800
Subject: [PATCH] fix:新增返回值
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 15 +++++++++++++++
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 10 ++++++++++
LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs | 6 ++++++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 9 +++++++++
4 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index a5476ae..40853ad 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -232,6 +232,11 @@
public string RefundCredentialsImgUrl { get; set; }
/// <summary>
+ /// 閫�娆鹃噾棰�
+ /// </summary>
+ public decimal? RefundPrice { get; set; }
+
+ /// <summary>
/// 涓嬪崟鏃堕棿
/// </summary>
public DateTime CreationTime { get; set; }
@@ -631,6 +636,11 @@
/// 鍥炲崟鍦板潃
/// </summary>
public string? ElecBillUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧洖鍗曞湴鍧�
+ /// </summary>
+ public string? RefundElecBillUrl { get; set; }
}
public class LifePayRefundOrderOutput
{
@@ -762,6 +772,11 @@
/// 鍥炲崟鍦板潃
/// </summary>
public string? ElecBillUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧洖鍗曞湴鍧�
+ /// </summary>
+ public string? RefundElecBillUrl { get; set; }
}
public class CreateLifePayOrderOutput
{
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index cfe7f0d..ff3ef8a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -304,6 +304,7 @@
PayTime = a.PayTime,
ACOOLYOrderNo = a.ACOOLYOrderNo,
RefundCredentialsImgUrl = a.RefundCredentialsImgUrl.GetOssPath(),
+ RefundPrice = a.RefundPrice,
CreationTime = a.CreationTime,
RefundCheckRemark = a.RefundCheckRemark,
RefundApplyRemark = a.RefundApplyRemark,
@@ -318,6 +319,11 @@
return result;
}
+ /// <summary>
+ /// 閫�娆捐鍗曞垎椤�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
public async Task<PageOutput<LifePayOrderListOutput>> GetLifePayRefundOrderPage(QueryLifePayRefundOrderListInput input)
{
@@ -360,6 +366,7 @@
RefundApplyRemark = a.RefundApplyRemark,
RefundApplyTime = a.RefundApplyTime,
RefundTime = a.RefundTime,
+ RefundPrice = a.RefundPrice,
ChannelName = b.ChannlesName,
ActualRechargeAmount = a.ActualRechargeAmount,
PlatformDeductionAmount = a.PlatformDeductionAmount,
@@ -410,6 +417,7 @@
PlatformRate = platformRate.Rate,
PlatformPrice = order.PlatformDeductionAmount,
ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
ChannleRate = channle.ChannlesRate,
ChannlesRakeRate = channle.ChannlesRakeRate,
ChannlesRakePrice = channlesRakePrice.HasValue ? 0 : Math.Round(channlesRakePrice.Value, 2),
@@ -460,6 +468,7 @@
ActualRechargeAmount = order.ActualRechargeAmount,
RefundPrice = order.RefundPrice,
ElecBillUrl = order.ElecBillUrl.GetOssPath(),
+ RefundElecBillUrl = order.RefundElecBillUrl.GetOssPath(),
};
return result;
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
index e82126f..580901f 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayOrder.cs
@@ -161,5 +161,11 @@
/// 鍥炲崟鍦板潃
/// </summary>
public string? ElecBillUrl { get; set; }
+
+ /// <summary>
+ /// 閫�娆惧洖鍗曞湴鍧�
+ /// </summary>
+ public string? RefundElecBillUrl { get; set; }
+
}
}
\ No newline at end of file
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 9f06faa..c4bc189 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -755,6 +755,11 @@
鐢宠閫�娆惧師鍥�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundApplyTime">
+ <summary>
+ 閫�娆剧敵璇锋椂闂�
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.RefundCheckRemark">
<summary>
椹冲洖鍘熷洜
@@ -1000,6 +1005,11 @@
瀹為檯鍏呭�奸噾棰�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.ActualReceivedAmount">
+ <summary>
+ 瀹為檯鍒拌处閲戦
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderOutput.RefundPrice">
<summary>
閫�娆鹃噾棰�
--
Gitblit v1.9.1