From e8f296f3017d46efb1018b8d8270c8db75c961d4 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 15:24:10 +0800
Subject: [PATCH] fix；bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 45 +++++++++++++---------
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 5 ++
LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs | 4 ++
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 13 ++++--
4 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index da36ea5..96a1397 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -153,7 +153,7 @@
/// <summary>
/// 鐢ㄦ埛鎵嬫満鍙�
/// </summary>
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
/// <summary>
/// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -163,7 +163,7 @@
/// <summary>
/// 娓犻亾鍚嶇О
/// </summary>
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
/// <summary>
/// 璁㈠崟绫诲瀷
@@ -178,7 +178,7 @@
/// <summary>
/// 閫�娆捐鍗曞彿
/// </summary>
- public string RefundOrderNo { get; set; }
+ public string? RefundOrderNo { get; set; }
/// <summary>
/// 鍏呭�奸噾棰�
@@ -281,6 +281,13 @@
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal ActualReceivedAmount { get; set; }
+
+ public LifePayStatusEnum? ActualReceivedStatus { get; set; }
}
public class LifePayOrderListTemplate
@@ -389,26 +396,26 @@
{
[Name("搴忓彿")]
- public int SerialNumber { get; set; }
+ public int? SerialNumber { get; set; }
[Name("鎵嬫満鍙�")]
- public string PhoneNumber { get; set; }
+ public string? PhoneNumber { get; set; }
public LifePayTypeEnum? LifePayType { get; set; }
- public LifePayOrderTypeEnum LifePayOrderType { get; set; }
+ public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
[Name("鍏呭�肩被鍨�")]
- public string LifePayOrderTypeStr { get; set; }
+ public string? LifePayOrderTypeStr { get; set; }
[Name("鍏呭�兼笭閬�")]
- public string ChannelName { get; set; }
+ public string? ChannelName { get; set; }
/// <summary>
/// 閫�娆剧敵璇锋椂闂�
/// </summary>
[Name("鐢宠閫�娆炬椂闂�")]
- public string RefundApplyTimeStr { get; set; }
+ public string? RefundApplyTimeStr { get; set; }
/// <summary>
/// 涓嬪崟鏃堕棿
@@ -416,14 +423,14 @@
public DateTime CreationTime { get; set; }
[Name("涓嬪崟鏃堕棿")]
- public string CreationTimeStr { get; set; }
+ public string? CreationTimeStr { get; set; }
[Name("閫�娆捐鍗曞彿")]
- public string RefundOrderNo { get; set; }
+ public string? RefundOrderNo { get; set; }
[Name("鍏呭�奸噾棰�")]
- public string RechargeAmountStr { get; set; }
+ public string? RechargeAmountStr { get; set; }
/// <summary>
@@ -435,7 +442,7 @@
/// 瀹為檯鍒拌处閲戦
/// </summary>
[Name("瀹為檯鍒拌处閲戦")]
- public string ActualReceivedAmount { get; set; }
+ public string? ActualReceivedAmount { get; set; }
/// <summary>
/// 瀹炰粯閲戦
@@ -443,7 +450,7 @@
public decimal PayAmount { get; set; }
[Name("瀹炰粯閲戦")]
- public string PayAmountStr { get; set; }
+ public string? PayAmountStr { get; set; }
[Name("閫�娆炬笭閬�")]
public string LifePayTypeStr { get; set; }
@@ -455,13 +462,13 @@
public decimal? RefundPrice { get; set; }
- public ACOOLYStatusEnum ACOOLYStatus { get; set; }
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
/// <summary>
/// 渚涘簲鍟嗚鍗曠姸鎬�
/// </summary>
[Name("渚涘簲鍟嗚鍗曠姸鎬�")]
- public string ACOOLYStatusStr { get; set; }
+ public string? ACOOLYStatusStr { get; set; }
/// <summary>
@@ -473,11 +480,13 @@
/// <summary>
/// 骞冲彴閫�娆剧姸鎬�
/// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
[Name("骞冲彴閫�娆剧姸鎬�")]
- public string LifePayRefundStatus { get; set; }
+ public string? LifePayRefundStatusStr { get; set; }
[Name("瀹屾垚鏃堕棿")]
- public string FinishTimeStr { get; set; }
+ public string? FinishTimeStr { get; set; }
}
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index 0db8bd2..df1bc9a 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -356,8 +356,6 @@
/// <returns></returns>
public async Task<List<LifePayRefundOrderListTemplate>> GetLifePayRefudOrderPageExport(QueryLifePayRefundOrderListInput input)
{
-
-
var result = await (await GetLifePayRefundOrderListFilter(input)).Select(x => new LifePayRefundOrderListTemplate
{
FinishTime = x.FinishTime,
@@ -367,7 +365,13 @@
PayAmount = x.PayAmount,
PhoneNumber = x.PhoneNumber,
RefundOrderNo = x.RefundOrderNo,
- ChannelName = x.ChannelName
+ ChannelName = x.ChannelName,
+ CreationTime = x.CreationTime,
+ ACOOLYStatus = x.ACOOLYStatus,
+ RechargeAmount = x.RechargeAmount,
+ ActualReceivedAmount = x.ActualReceivedAmount.ToString("F2"),
+ LifePayRefundStatus = x.LifePayRefundStatus,
+
}).OrderByDescending(r => r.CreationTime).ToListAsync();
var i = 0;
result.ForEach(s =>
@@ -378,7 +382,7 @@
s.CreationTimeStr = s.CreationTime.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
s.RechargeAmountStr = s.RechargeAmount.ToString("F2");
s.ActualReceivedAmount = s.ActualReceivedAmount;
- s.LifePayRefundStatus = s.LifePayRefundStatus.GetDescription();
+ s.LifePayRefundStatusStr = s.LifePayRefundStatus.GetDescription();
s.PayAmountStr = s.PayAmount.ToString("F2");
s.LifePayTypeStr = s.LifePayType.GetDescription();
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
@@ -2015,6 +2019,7 @@
PlatformDeductionAmount = a.PlatformDeductionAmount,
ACOOLYStatus = a.ACOOLYStatus,
LifePayRefundStatus = a.LifePayRefundStatus,
+ ActualReceivedAmount = a.ActualReceivedAmount.HasValue? a.ActualReceivedAmount.Value : 0
});
return result;
}
diff --git a/LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs b/LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs
index 10bfd74..9904abc 100644
--- a/LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs
+++ b/LifePayment/LifePayment.Domain.Shared/Extension/EnumExtension.cs
@@ -165,6 +165,10 @@
/// <returns></returns>
public static string GetDescription(this object value)
{
+ if (value==null)
+ {
+ return null;
+ }
return value.GetType().GetMember(value.ToString() ?? string.Empty).FirstOrDefault()
?.GetCustomAttribute<DescriptionAttribute>()?.Description;
}
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index d1566ed..14b85ad 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -841,6 +841,11 @@
骞冲彴閫�娆剧姸鎬�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListOutput.ActualReceivedAmount">
+ <summary>
+ 瀹為檯鍒拌处閲戦
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.CreationTime">
<summary>
涓嬪崟鏃堕棿
--
Gitblit v1.9.1