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 |  120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 118 insertions(+), 2 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 3fde72d..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>
     /// 璁㈠崟绫诲瀷
@@ -174,6 +174,11 @@
     /// 璁㈠崟鍙�
     /// </summary>
     public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 閫�娆捐鍗曞彿
+    /// </summary>
+    public string? RefundOrderNo { get; set; }
 
     /// <summary>
     /// 鍏呭�奸噾棰�
@@ -276,6 +281,13 @@
     /// 骞冲彴閫�娆剧姸鎬�
     /// </summary>
     public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal ActualReceivedAmount { get; set; }
+
+    public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
 
 public class LifePayOrderListTemplate
@@ -379,6 +391,105 @@
 
 }
 
+
+public class LifePayRefundOrderListTemplate
+{
+
+    [Name("搴忓彿")]
+    public int? SerialNumber { get; set; }
+
+    [Name("鎵嬫満鍙�")]
+    public string? PhoneNumber { get; set; }
+
+    public LifePayTypeEnum? LifePayType { get; set; }
+
+    public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
+
+    [Name("鍏呭�肩被鍨�")]
+    public string? LifePayOrderTypeStr { get; set; }
+
+    [Name("鍏呭�兼笭閬�")]
+    public string? ChannelName { get; set; }
+
+    /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    [Name("鐢宠閫�娆炬椂闂�")]
+    public string? RefundApplyTimeStr { get; set; }
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string? CreationTimeStr { get; set; }
+
+    [Name("閫�娆捐鍗曞彿")]
+    public string? RefundOrderNo { get; set; }
+
+
+    [Name("鍏呭�奸噾棰�")]
+    public string? RechargeAmountStr { get; set; }
+
+
+    /// <summary>
+    /// 鍏呭�奸噾棰�
+    /// </summary>
+    public decimal RechargeAmount { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    [Name("瀹為檯鍒拌处閲戦")]
+    public string? ActualReceivedAmount { get; set; }
+
+    /// <summary>
+    /// 瀹炰粯閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    [Name("瀹炰粯閲戦")]
+    public string? PayAmountStr { get; set; }
+
+    [Name("閫�娆炬笭閬�")]
+    public string LifePayTypeStr { get; set; }
+
+    /// <summary>
+    /// 閫�娆鹃噾棰�
+    /// </summary>
+    [Name("閫�娆鹃噾棰�")]
+    public decimal? RefundPrice { get; set; }
+
+
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    [Name("渚涘簲鍟嗚鍗曠姸鎬�")]
+    public string? ACOOLYStatusStr { get; set; }
+
+
+    /// <summary>
+    /// 瀹屾垚鏃堕棿
+    /// </summary>
+    public DateTime? FinishTime { get; set; }
+
+
+    /// <summary>
+    /// 骞冲彴閫�娆剧姸鎬�
+    /// </summary>
+    public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; }
+
+    [Name("骞冲彴閫�娆剧姸鎬�")]
+    public string? LifePayRefundStatusStr { get; set; }
+
+    [Name("瀹屾垚鏃堕棿")]
+    public string? FinishTimeStr { get; set; }
+
+
+}
 public class UserLifePayOrderOutput
 {
     public Guid Id { get; set; }
@@ -935,4 +1046,9 @@
     /// </summary>
     public int YesterdayActiveUsers { get; set; }
 
+}
+
+public class ChannelRateOutput
+{
+    public decimal ChannlesRate { get; set; }
 }
\ No newline at end of file

--
Gitblit v1.9.1