From 2469c045046c8b89da93e0331a8ef771e5c78ff9 Mon Sep 17 00:00:00 2001
From: lingling <kety1122@163.com>
Date: 星期一, 24 三月 2025 15:41:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

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

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index da36ea5..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>
     /// 璁㈠崟绫诲瀷
@@ -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
@@ -389,26 +396,26 @@
 {
 
     [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>
     /// 涓嬪崟鏃堕棿
@@ -416,14 +423,14 @@
     public DateTime CreationTime { get; set; }
 
     [Name("涓嬪崟鏃堕棿")]
-    public string CreationTimeStr { get; set; }
+    public string? CreationTimeStr { get; set; }
 
     [Name("閫�娆捐鍗曞彿")]
-    public string RefundOrderNo { get; set; }
+    public string? RefundOrderNo { get; set; }
 
 
     [Name("鍏呭�奸噾棰�")]
-    public string RechargeAmountStr { get; set; }
+    public string? RechargeAmountStr { get; set; }
 
 
     /// <summary>
@@ -435,7 +442,7 @@
     /// 瀹為檯鍒拌处閲戦
     /// </summary>
     [Name("瀹為檯鍒拌处閲戦")]
-    public string ActualReceivedAmount { get; set; }
+    public string? ActualReceivedAmount { get; set; }
 
     /// <summary>
     /// 瀹炰粯閲戦
@@ -443,7 +450,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 +462,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 +480,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; }
 
 
 }

--
Gitblit v1.9.1