From 4eedc195454975c675cbe5a2982c5b5f4f1301f8 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 24 三月 2025 15:43:26 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 48 ++++++++++++++++++++----
LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml | 25 ++++++++++--
LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs | 2
LifePayment/LifePayment.Application/LifePay/LifePayService.cs | 17 ++++++--
4 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 96a1397..42dcbb0 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -329,6 +329,14 @@
public string RechargeAmountStr { get; set; }
/// <summary>
+ /// 瀹為檯鍏呭�奸噾棰�
+ /// </summary>
+ public decimal ActualRechargeAmount { get; set; }
+
+ [Name("瀹為檯鍏呭�奸噾棰�")]
+ public string ActualRechargeAmountStr { get; set; }
+
+ /// <summary>
/// 浼樻儬閲戦
/// </summary>
public decimal DiscountAmount { get; set; }
@@ -356,6 +364,30 @@
public string ACOOLYOrderNo { get; set; }
/// <summary>
+ /// 骞冲彴鎵ｆ閲戦
+ /// </summary>
+ [Name("骞冲彴鎵ｆ閲戦")]
+ public decimal PlatformPrice { get; set; }
+
+ /// <summary>
+ /// 骞冲彴閫�娆剧姸鎬�
+ /// </summary>
+ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+ [Name("骞冲彴閫�娆剧姸鎬�")]
+ public string? LifePayRefundStatusStr { get; set; }
+
+
+
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗚鍗曠姸鎬�
+ /// </summary>
+ [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+ public string? ACOOLYStatusStr { get; set; }
+
+ /// <summary>
/// 鏀粯鐘舵��
/// </summary>
public LifePayStatusEnum PayStatus { get; set; }
@@ -366,16 +398,16 @@
[Name("鏀粯娓犻亾娴佹按鍙�")]
public string OutOrderNo { get; set; }
- [Name("閫�娆剧敵璇�")]
- public string RefundApplyRemark { get; set; }
+ //[Name("閫�娆剧敵璇�")]
+ //public string RefundApplyRemark { get; set; }
- /// <summary>
- /// 璁㈠崟鐘舵��
- /// </summary>
- public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
+ ///// <summary>
+ ///// 璁㈠崟鐘舵��
+ ///// </summary>
+ //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; }
- [Name("璁㈠崟鐘舵��")]
- public string LifePayOrderStatusStr { get; set; }
+ //[Name("璁㈠崟鐘舵��")]
+ //public string LifePayOrderStatusStr { get; set; }
/// <summary>
/// 瀹屾垚鏃堕棿
diff --git a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
index 76e561d..0a0d905 100644
--- a/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/User/CreateBackClientUserInput.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 璐︽埛
/// </summary>
- [RegularExpression(LifePaymentConstant.RegularExpression.UserNameEx, ErrorMessage = "璐﹀彿鏍煎紡涓嶆纭�")]
+ //[RegularExpression(LifePaymentConstant.RegularExpression.UserNameEx, ErrorMessage = "璐﹀彿鏍煎紡涓嶆纭�")]
public string UserName { get; set; }
public string Remark { get; set; }
diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index df1bc9a..64c30f2 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -721,11 +721,12 @@
{
DiscountAmount = x.DiscountAmount,
FinishTime = x.FinishTime,
- LifePayOrderStatus = x.LifePayOrderStatus,
+ //LifePayOrderStatus = x.LifePayOrderStatus,
LifePayOrderType = x.LifePayOrderType,
LifePayType = x.LifePayType,
OrderNo = x.OrderNo,
PayAmount = x.PayAmount,
+ ActualRechargeAmount = x.ActualRechargeAmount.HasValue?x.ActualRechargeAmount.Value:0,
PhoneNumber = x.PhoneNumber,
RechargeAmount = x.RechargeAmount,
OutOrderNo = x.OutOrderNo,
@@ -733,8 +734,11 @@
PayTime = x.PayTime,
ACOOLYOrderNo = x.ACOOLYOrderNo,
CreationTime = x.CreationTime,
- RefundApplyRemark = x.RefundApplyRemark,
- ChannelName = x.ChannelName
+ LifePayRefundStatus = x.LifePayRefundStatus,
+ ACOOLYStatus = x.ACOOLYStatus,
+ //RefundApplyRemark = x.RefundApplyRemark,
+ ChannelName = x.ChannelName,
+ PlatformPrice = x.PlatformDeductionAmount.HasValue ? x.PlatformDeductionAmount.Value : 0
}).OrderByDescending(r => r.CreationTime).ToListAsync();
var i = 0;
result.ForEach(s =>
@@ -747,7 +751,10 @@
s.PayTimeStr = !s.PayTime.HasValue ? string.Empty : s.PayTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
s.LifePayTypeStr = s.LifePayType.GetDescription();
s.PayStatusStr = s.PayStatus.GetDescription();
- s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
+ s.ActualRechargeAmountStr = s.ActualRechargeAmount.ToString("F2");
+ s.LifePayRefundStatusStr = s.LifePayRefundStatusStr.GetDescription();
+ s.ACOOLYStatusStr = s.ACOOLYStatus.GetDescription();
+ //s.LifePayOrderStatusStr = s.LifePayOrderStatus.GetDescription();
s.FinishTimeStr = !s.FinishTime.HasValue ? string.Empty : s.FinishTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
});
return result;
@@ -1398,9 +1405,9 @@
&& order.LifePayOrderStatus != LifePayOrderStatusEnum.寰呴��娆� && order.LifePayOrderStatus != LifePayOrderStatusEnum.宸查��娆�)
{
order.LifePayOrderStatus = LifePayOrderStatusEnum.寰呴��娆�;
+ order.LifePayRefundStatus = LifePayRefundStatusEnum.寰呴��娆�;
order.RefundApplyRemark = input.RefundApplyRemark;
order.RefundApplyTime = DateTime.Now;
-
await _lifePayOrderRepository.UpdateAsync(order);
}
else if (order.LifePayOrderStatus == LifePayOrderStatusEnum.寰呴��娆� || order.LifePayRefundStatus == LifePayRefundStatusEnum.寰呴��娆� ||
diff --git a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
index 14b85ad..e0d1c58 100644
--- a/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
+++ b/LifePayment/LifePayment.Host/LifePaymentServices.Application.Contracts.xml
@@ -856,6 +856,11 @@
鍏呭�奸噾棰�
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.ActualRechargeAmount">
+ <summary>
+ 瀹為檯鍏呭�奸噾棰�
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.DiscountAmount">
<summary>
浼樻儬閲戦
@@ -871,14 +876,24 @@
鏀粯鏃堕棿
</summary>
</member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.PlatformPrice">
+ <summary>
+ 骞冲彴鎵ｆ閲戦
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.LifePayRefundStatus">
+ <summary>
+ 骞冲彴閫�娆剧姸鎬�
+ </summary>
+ </member>
+ <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.ACOOLYStatusStr">
+ <summary>
+ 渚涘簲鍟嗚鍗曠姸鎬�
+ </summary>
+ </member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.PayStatus">
<summary>
鏀粯鐘舵��
- </summary>
- </member>
- <member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.LifePayOrderStatus">
- <summary>
- 璁㈠崟鐘舵��
</summary>
</member>
<member name="P:LifePayment.Application.Contracts.LifePayOrderListTemplate.FinishTime">
--
Gitblit v1.9.1