From 2e8af68ae38908ede18d44e219ab2853ae0b3914 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期二, 25 三月 2025 13:18:43 +0800
Subject: [PATCH] fix：bug修复

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  101 +++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index da36ea5..7ba1524 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
@@ -322,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; }
@@ -349,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; }
@@ -359,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>
     /// 瀹屾垚鏃堕棿
@@ -389,41 +428,42 @@
 {
 
     [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>
     /// 涓嬪崟鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
 
-    [Name("涓嬪崟鏃堕棿")]
-    public string CreationTimeStr { get; set; }
 
     [Name("閫�娆捐鍗曞彿")]
-    public string RefundOrderNo { get; set; }
+    public string? RefundOrderNo { get; set; }
 
+
+    [Name("閫�娆剧敵璇�")]
+    public string? RefundApplyRemark { get; set; }
 
     [Name("鍏呭�奸噾棰�")]
-    public string RechargeAmountStr { get; set; }
+    public string? RechargeAmountStr { get; set; }
 
 
     /// <summary>
@@ -435,7 +475,7 @@
     /// 瀹為檯鍒拌处閲戦
     /// </summary>
     [Name("瀹為檯鍒拌处閲戦")]
-    public string ActualReceivedAmount { get; set; }
+    public string? ActualReceivedAmount { get; set; }
 
     /// <summary>
     /// 瀹炰粯閲戦
@@ -443,7 +483,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 +495,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 +513,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; }
 
 
 }
@@ -551,6 +593,11 @@
     public DateTime? RefundTime { get; set; }
 
     /// <summary>
+    /// 閫�娆剧敵璇锋椂闂�
+    /// </summary>
+    public DateTime? RefundApplyTime { get; set; }
+
+    /// <summary>
     /// 閫�娆惧嚟璇�
     /// </summary>
     public string RefundCredentialsImgUrl { get; set; }

--
Gitblit v1.9.1