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/LifePay/LifePayService.cs |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

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;
     }

--
Gitblit v1.9.1