From 1447caa6b184ee1e80970740e30fa970c3d08a78 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期一, 31 三月 2025 13:54:38 +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 | 94 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 87 insertions(+), 7 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index a0614f0..ceb6dc1 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs @@ -1110,10 +1110,8 @@ /// </summary> public string Link { get; set; } } -public class LifePayRechargeReceiptsPageOutput<T> : PageOutputBase +public class LifePayRechargeReceiptsStatistics { - - public List<T> Data { get; set; } = new List<T>(); /// <summary> /// 绱鍏呭�� @@ -1177,6 +1175,23 @@ public string Name { get; set; } public string ChannlesNum { get; set; } + + public Guid ChannlesId { 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 @@ -1216,11 +1231,8 @@ /// </summary> public DateTime FinishTime { get; set; } } -public class LifePayExpensesReceiptsPageOutput<T> : PageOutputBase +public class LifePayExpensesReceiptsStatistics { - - public List<T> Data { get; set; } = new List<T>(); - /// <summary> /// 绱鏀跺叆 /// </summary> @@ -1235,4 +1247,72 @@ /// 瀹為檯鏀跺叆 /// </summary> public decimal RealIncome { get; set; } +} + +public class LifePayLifePayChannlesRakeStatistics +{ + /// <summary> + /// 鍚堣浣i噾 + /// </summary> + public decimal TotalRakePrice { get; set; } +} + +public class ReceiptsListOutPut +{ + /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + public DateTime CreationTime { get; set; } + + public decimal Amount { 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> + /// 娓犻亾浣i噾姣斾緥 + /// </summary> + public decimal ChannlesRakeRate { get; set; } + + /// <summary> + /// 浣i噾 + /// </summary> + public decimal ChannlesRakePrice { get; set; } + + /// <summary> + /// 缁撶畻鏃堕棿 + /// </summary> + public DateTime FinishTime { get; set; } + + /// <summary> + /// 涓嬪崟鏃堕棿 + /// </summary> + public DateTime CreationTime { set; get; } + + /// <summary> + /// 鎷撳睍灞炴�� + /// </summary> + public string ExtraProperties { get; set; } + + /// <summary> + /// 涓嬪崟娓犻亾 + /// </summary> + public string ChannelId { get; set; } } \ No newline at end of file -- Gitblit v1.9.1