From 5a09f64b974521e25ef07c0691361ba5d71e919b Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 16 四月 2025 17:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi

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

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 8ce0ecf..3cad7a6 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -286,7 +286,7 @@
     /// <summary>
     /// 瀹為檯鍒拌处閲戦
     /// </summary>
-    public decimal ActualReceivedAmount { get; set; }
+    public decimal? ActualReceivedAmount { get; set; }
 
     public LifePayStatusEnum? ActualReceivedStatus { get; set; }
 }
@@ -532,6 +532,9 @@
 
     [Name("瀹屾垚鏃堕棿")]
     public string? FinishTimeStr { get; set; }
+
+    [Name("骞冲彴璁㈠崟鍙�")]
+    public string OrderNo { get; set; }
 
 
 }
@@ -1096,7 +1099,10 @@
     /// </summary>
     public int YesterdayActiveUsers { get; set; }
 
-
+    /// <summary>
+    /// 绱浣ｉ噾
+    /// </summary>
+    public decimal AccumulatedChannlesRakePrice { get; set; }
 }
 
 public class ChannelRateOutput
@@ -1111,9 +1117,22 @@
     /// </summary>
     public string Link { get; set; }
 }
+
+public class LifePayConsumptionStatistics
+{
+    /// <summary>
+    /// 绱鎵ｆ
+    /// </summary>
+    public decimal TotalDeductionAmount { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨涓�
+    /// </summary>
+    public decimal TotalFrozenAmount { get; set; }
+}
+
 public class LifePayRechargeReceiptsStatistics
 {
-
     /// <summary>
     /// 绱鍏呭��
     /// </summary>
@@ -1160,20 +1179,26 @@
     /// </summary>
     public Guid Id { get; set; }
 
-    // <summary>
+    /// <summary>
     /// 骞冲彴璁㈠崟鍙�
     /// </summary>
     public string OrderNo { get; set; }
 
     /// <summary>
-    /// 娓犻亾娴佹按鍙�
+    /// 澶栭儴璁㈠崟鍙�
     /// </summary>
-    public string OutOrderNo { get; set; }
+    public string AcoolyOrderNo { get; set; }
 
     /// <summary>
     /// 浜ゆ槗閲戦
     /// </summary>
     public decimal Amount { get; set; }
+
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum ACOOLYStatus { get; set; }
 
     /// <summary>
     /// 璁拌处鏃堕棿
@@ -1334,6 +1359,14 @@
     public decimal Amount { get; set; }
 }
 
+public class ChannlesRakeListOutPut
+{
+    /// <summary>
+    /// 30澶╀剑閲�
+    /// </summary>
+    public List<ReceiptsDetail> ChannlesRakeList { get; set; } = new List<ReceiptsDetail> { };
+}
+
 public class ChannelDataListOutPut
 {
     /// <summary>
@@ -1351,9 +1384,9 @@
 public class ChannelDataReceive
 {
     /// <summary>
-    /// 娓犻亾缂栧彿
+    /// 娓犻亾鍚嶇О
     /// </summary>
-    public string ChannelId { get; set; }
+    public string ChannelName { get; set; }
 
     /// <summary>
     /// 鏀舵
@@ -1370,9 +1403,9 @@
 public class ChannelDataUserNumber
 {
     /// <summary>
-    /// 娓犻亾缂栧彿
+    /// 娓犻亾鍚嶇О
     /// </summary>
-    public string ChannelId { get; set; }
+    public string ChannelName { get; set; }
 
     /// <summary>
     /// 鐢ㄦ埛鏁伴噺
@@ -1414,7 +1447,7 @@
     /// <summary>
     /// 缁撶畻鏃堕棿
     /// </summary>
-    public DateTime FinishTime { get; set; }
+    public DateTime? FinishTime { get; set; }
 
     /// <summary>
     /// 涓嬪崟鏃堕棿
@@ -1478,7 +1511,7 @@
     /// <summary>
     /// 缁撶畻鏃堕棿
     /// </summary>
-    public DateTime FinishTime { get; set; }
+    public DateTime? FinishTime { get; set; }
 
     [Name("缁撶畻鏃堕棿")]
     public string FinishTimeStr { get; set; }

--
Gitblit v1.9.1