From f885db9e204c172c62779f45c3edee3cae463b8d Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 01 四月 2025 16:00:33 +0800
Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs |  173 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 170 insertions(+), 3 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index ceb6dc1..8ce0ecf 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1096,6 +1096,7 @@
     /// </summary>
     public int YesterdayActiveUsers { get; set; }
 
+
 }
 
 public class ChannelRateOutput
@@ -1152,6 +1153,54 @@
     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 OutOrderNo { get; set; }
+
+    /// <summary>
+    /// 浜ゆ槗閲戦
+    /// </summary>
+    public decimal Amount { 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
 {
     /// <summary>
@@ -1177,6 +1226,8 @@
     public string ChannlesNum { get; set; }
 
     public Guid ChannlesId { get; set; }
+
+    public LifePaySwitchTypeEnum SwitchType { get; set; }
 }
 
 public class BackClientUserInfoOutput
@@ -1260,12 +1311,76 @@
 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 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 ChannelId { get; set; }
+
+    /// <summary>
+    /// 鏀舵
+    /// </summary>
+    public decimal ReceivePrice { get; set; }
+
+    /// <summary>
+    /// 浣ｉ噾
+    /// </summary>
+    public decimal ChannlesRakePrice { get; set; }
+
+}
+
+public class ChannelDataUserNumber
+{
+    /// <summary>
+    /// 娓犻亾缂栧彿
+    /// </summary>
+    public string ChannelId { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛鏁伴噺
+    /// </summary>
+    public int Number { get; set; }
+
+}
+
 
 public class LifePayChannlesRakeListOutput
 {
@@ -1304,7 +1419,7 @@
     /// <summary>
     /// 涓嬪崟鏃堕棿
     /// </summary>
-    public DateTime CreationTime {  set; get; }
+    public DateTime CreationTime { get; set; }
 
     /// <summary>
     /// 鎷撳睍灞炴��
@@ -1315,4 +1430,56 @@
     /// 涓嬪崟娓犻亾
     /// </summary>
     public string ChannelId { get; set; }
-}
\ No newline at end of file
+}
+public class LifePayChannlesRakeListTemplate
+{
+    [Name("搴忓彿")]
+    public int SerialNumber { get; set; }
+
+
+    /// <summary>
+    /// 涓嬪崟鏃堕棿
+    /// </summary>
+    public DateTime CreationTime { get; set; }
+
+    [Name("涓嬪崟鏃堕棿")]
+    public string CreationTimeStr { get; set; }
+
+    /// <summary>
+    /// 骞冲彴璁㈠崟鍙�
+    /// </summary>
+    [Name("骞冲彴璁㈠崟鍙�")]
+    public string OrderNo { get; set; }
+
+    /// <summary>
+    /// 鎴愪氦閲戦
+    /// </summary>
+    public decimal PayAmount { get; set; }
+
+    [Name("鎴愪氦閲戦(鍏�)")]
+    public string PayAmountStr { get; set; }
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾姣斾緥
+    /// </summary>
+    public decimal ChannlesRakeRate { get; set; }
+
+    [Name("浣ｉ噾姣斾緥")]
+    public string ChannlesRakeRateStr { get; set; }
+
+    /// <summary>
+    /// 浣ｉ噾
+    /// </summary>
+    public decimal ChannlesRakePrice { get; set; }
+
+    [Name("鍒嗕剑(鍏�)")]
+    public string ChannlesRakePriceStr { get; set; }
+
+    /// <summary>
+    /// 缁撶畻鏃堕棿
+    /// </summary>
+    public DateTime FinishTime { get; set; }
+
+    [Name("缁撶畻鏃堕棿")]
+    public string FinishTimeStr { get; set; }
+}

--
Gitblit v1.9.1