From a099df38e66edc9e7f43212fc385db0f1169b12a Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 25 三月 2025 14:36:48 +0800
Subject: [PATCH] fix:退款导出bug

---
 LifePayment/LifePayment.Application/LifePay/LifePayService.cs |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
index c6eee0b..5d1667d 100644
--- a/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/LifePayService.cs
@@ -283,7 +283,7 @@
                                 RefundApplyRemark = a.RefundApplyRemark,
                                 RefundTime = a.RefundTime,
                                 ChannelName = b.ChannlesName,
-                                ActualRechargeAmount = a.ActualRechargeAmount,
+                                ActualRechargeAmount = a.RechargeAmount,
                                 PlatformDeductionAmount = a.PlatformDeductionAmount,
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
@@ -340,7 +340,7 @@
                                 RefundTime = a.RefundTime,
                                 RefundPrice = a.RefundPrice,
                                 ChannelName = b.ChannlesName,
-                                ActualRechargeAmount = a.ActualRechargeAmount,
+                                ActualRechargeAmount = a.RechargeAmount,
                                 PlatformDeductionAmount = a.PlatformDeductionAmount,
                                 ACOOLYStatus = a.ACOOLYStatus,
                                 LifePayRefundStatus = a.LifePayRefundStatus,
@@ -365,6 +365,7 @@
             PayAmount = x.PayAmount,
             PhoneNumber = x.PhoneNumber,
             RefundOrderNo = x.RefundOrderNo,
+            RefundApplyTime = x.RefundApplyTime,
             ChannelName = x.ChannelName,
             CreationTime = x.CreationTime,
             ACOOLYStatus = x.ACOOLYStatus,
@@ -386,6 +387,7 @@
             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);
+            s.RefundApplyTimeStr = !s.RefundApplyTime.HasValue? string.Empty:s.RefundApplyTime.Value.ToString(LifePaymentConstant.DateTimeFormatStr.yyyyMMddHHmm);
         });
         return result;
     }
@@ -1387,10 +1389,10 @@
 
                 break;
             case LifePayTypeEnum.AliPay:
-                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice * 100).ToString() });
+                var aliRefundResult = await AliTradeRefund(new AlipayTradeRefundRequest() { OutTradeNo = order.OrderNo, RefundAmount = Convert.ToInt32(input.RefundPrice).ToString() });
                 if (aliRefundResult.Code != AlipayResultCode.Success)
                 {
-                    throw new UserFriendlyException("閫�娆惧け璐�");
+                    throw new UserFriendlyException("閫�娆惧け璐�:" + aliRefundResult.SubMsg);
                 }
 
                 order.LifePayOrderStatus = LifePayOrderStatusEnum.宸查��娆�;

--
Gitblit v1.9.1