From bf2d06ee46b254097c1d205c2ce37ab15a4ad91b Mon Sep 17 00:00:00 2001
From: lingling <kety1122@163.com>
Date: 星期三, 16 四月 2025 14:20:51 +0800
Subject: [PATCH] fix bug

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  156 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 151 insertions(+), 5 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index a93a33f..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,6 +1099,10 @@
     /// </summary>
     public int YesterdayActiveUsers { get; set; }
 
+    /// <summary>
+    /// 绱浣ｉ噾
+    /// </summary>
+    public decimal AccumulatedChannlesRakePrice { get; set; }
 }
 
 public class ChannelRateOutput
@@ -1110,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>
@@ -1150,6 +1170,60 @@
     /// 璁拌处鏃堕棿
     /// </summary>
     public DateTime CreationTime { get; set; }
+}
+
+public class LifePayConsumptionListOutput
+{
+    /// <summary>
+    /// 缂栧彿
+    /// </summary>
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 骞冲彴璁㈠崟鍙�
+    /// </summary>
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 澶栭儴璁㈠崟鍙�
+    /// </summary>
+    public string AcoolyOrderNo { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗閲戦
+    /// </summary>
+    public decimal Amount { get; set; }
+
+
+    /// <summary>
+    /// 渚涘簲鍟嗚鍗曠姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum ACOOLYStatus { get; set; }
+
+    /// <summary>
+    /// 璁拌处鏃堕棿
+    /// </summary>
+    public DateTime FinishTime { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨鐘舵��
+    /// </summary>
+    public ConsumptionFrozenStatusEnum FrozenStatus { get; set; }
+
+    /// <summary>
+    /// 璧勯噾娴佸悜
+    /// </summary>
+    public ConsumptionFlowEnum Flow { get; set; }
+
+    /// <summary>
+    /// 鎵ｆ閲戦
+    /// </summary>
+    public decimal DeductionAmount { get; set; }
+
+    /// <summary>
+    /// 鍐荤粨閲戦
+    /// </summary>
+    public decimal FrozenAmount { get; set; }
 }
 
 public class LifePayPhoneMesssageCodeLoginOutput
@@ -1262,12 +1336,84 @@
 public class ReceiptsListOutPut
 {
     /// <summary>
+    /// 30澶╂敹娆�
+    /// </summary>
+    public List<ReceiptsDetail> ReceiveList { get; set; } = new List<ReceiptsDetail>();
+
+    /// <summary>
+    /// 30澶╂敹鍏�
+    /// </summary>
+    public List<ReceiptsDetail> IncomeList { get; set; } = new List<ReceiptsDetail>();
+}
+
+public class ReceiptsDetail
+{
+    /// <summary>
     /// 鍒涘缓鏃堕棿
     /// </summary>
-    public DateTime CreationTime { get; set; }
+    public string CreationTime { get; set; }
 
+    /// <summary>
+    /// 閲戦
+    /// </summary>
     public decimal Amount { get; set; }
 }
+
+public class ChannlesRakeListOutPut
+{
+    /// <summary>
+    /// 30澶╀剑閲�
+    /// </summary>
+    public List<ReceiptsDetail> ChannlesRakeList { get; set; } = new List<ReceiptsDetail> { };
+}
+
+public class ChannelDataListOutPut
+{
+    /// <summary>
+    /// Top5娓犻亾鏀舵
+    /// </summary>
+    public List<ChannelDataReceive> ReceiveList { get; set; } = new List<ChannelDataReceive>();
+
+    /// <summary>
+    /// Top5娓犻亾鐢ㄦ埛
+    /// </summary>
+    public List<ChannelDataUserNumber> UserNumberList { get; set; } = new List<ChannelDataUserNumber>();
+
+}
+
+public class ChannelDataReceive
+{
+    /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelName { get; set; }
+
+    /// <summary>
+    /// 鏀舵
+    /// </summary>
+    public decimal ReceivePrice { get; set; }
+
+    /// <summary>
+    /// 浣ｉ噾
+    /// </summary>
+    public decimal ChannlesRakePrice { get; set; }
+
+}
+
+public class ChannelDataUserNumber
+{
+    /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelName { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛鏁伴噺
+    /// </summary>
+    public int Number { get; set; }
+
+}
+
 
 public class LifePayChannlesRakeListOutput
 {
@@ -1301,7 +1447,7 @@
     /// <summary>
     /// 缁撶畻鏃堕棿
     /// </summary>
-    public DateTime FinishTime { get; set; }
+    public DateTime? FinishTime { get; set; }
 
     /// <summary>
     /// 涓嬪崟鏃堕棿
@@ -1365,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