From f291f615859f129265f740526cba144415d7b49e Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 07 四月 2025 10:32:47 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 371 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 368 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
index 6059095..5e4627b 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs
@@ -1096,6 +1096,10 @@
/// </summary>
public int YesterdayActiveUsers { get; set; }
+ /// <summary>
+ /// 绱浣ｉ噾
+ /// </summary>
+ public decimal AccumulatedChannlesRakePrice { get; set; }
}
public class ChannelRateOutput
@@ -1110,11 +1114,22 @@
/// </summary>
public string Link { get; set; }
}
-public class LifePayRechargeReceiptsPageOutput<T> : PageOutputBase
+
+public class LifePayConsumptionStatistics
{
+ /// <summary>
+ /// 绱鎵ｆ
+ /// </summary>
+ public decimal TotalDeductionAmount { get; set; }
- public List<T> Data { get; set; } = new List<T>();
+ /// <summary>
+ /// 鍐荤粨涓�
+ /// </summary>
+ public decimal TotalFrozenAmount { get; set; }
+}
+public class LifePayRechargeReceiptsStatistics
+{
/// <summary>
/// 绱鍏呭��
/// </summary>
@@ -1147,4 +1162,354 @@
/// 鍑瘉
/// </summary>
public string Voucher { get; set; }
-}
\ No newline at end of file
+
+ /// <summary>
+ /// 璁拌处鏃堕棿
+ /// </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
+{
+ /// <summary>
+ /// 鐢ㄦ埛Id
+ /// </summary>
+ public Guid UserId { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏄悗鍙扮敤鎴�
+ /// </summary>
+ public bool IsBackClientUser { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍙�
+ /// </summary>
+ public List<ChannelOutput> ChannlesNum { get; set; }
+}
+
+public class ChannelOutput
+{
+ public string Name { get; set; }
+
+ public string ChannlesNum { get; set; }
+
+ public Guid ChannlesId { get; set; }
+
+ public LifePaySwitchTypeEnum SwitchType { get; set; }
+}
+
+public class BackClientUserInfoOutput
+{
+ /// <summary>
+ /// 鏄惁鏄悗鍙扮敤鎴�
+ /// </summary>
+ public bool IsBackClientUser { get; set; }
+
+ public bool IsSystem { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍙�
+ /// </summary>
+ public List<ChannelOutput> ChannleList { get; set; }
+}
+
+public class LifePayExpensesReceiptsListOutput
+{
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 娓犻亾娴佹按鍙�
+ /// </summary>
+ public string OutOrderNo { get; set; }
+
+ /// <summary>
+ /// 鏀粯娓犻亾
+ /// </summary>
+ public LifePayTypeEnum LifePayType { get; set; }
+
+ /// <summary>
+ /// 鏀舵敮绫诲瀷
+ /// </summary>
+ public ExpensesReceiptsTypeEnum ExpensesReceiptsType { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗閲戦
+ /// </summary>
+ public decimal Amount { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗鏃堕棿
+ /// </summary>
+ public DateTime FinishTime { get; set; }
+}
+public class LifePayExpensesReceiptsStatistics
+{
+ /// <summary>
+ /// 绱鏀跺叆
+ /// </summary>
+ public decimal TotalIncome { get; set; }
+
+ /// <summary>
+ /// 绱閫�娆�
+ /// </summary>
+ public decimal TotalRefund { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鏀跺叆
+ /// </summary>
+ public decimal RealIncome { get; set; }
+}
+
+public class LifePayLifePayChannlesRakeStatistics
+{
+ /// <summary>
+ /// 鍚堣浣ｉ噾
+ /// </summary>
+ public decimal TotalRakePrice { get; set; }
+}
+
+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 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
+{
+
+ /// <summary>
+ /// 缂栧彿
+ /// </summary>
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 鎴愪氦閲戦
+ /// </summary>
+ public decimal PayAmount { get; set; }
+
+
+ /// <summary>
+ /// 娓犻亾浣ｉ噾姣斾緥
+ /// </summary>
+ public decimal ChannlesRakeRate { get; set; }
+
+ /// <summary>
+ /// 浣ｉ噾
+ /// </summary>
+ public decimal ChannlesRakePrice { get; set; }
+
+ /// <summary>
+ /// 缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime? FinishTime { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime CreationTime { get; set; }
+
+ /// <summary>
+ /// 鎷撳睍灞炴��
+ /// </summary>
+ public string ExtraProperties { get; set; }
+
+ /// <summary>
+ /// 涓嬪崟娓犻亾
+ /// </summary>
+ public string ChannelId { get; set; }
+}
+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