From 0e02177639a7c0fe98b8acaa3dc0e84a81d60817 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 08 四月 2025 11:24:21 +0800 Subject: [PATCH] fix: bug --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 153 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 149 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index 1d624a9..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> + /// 绱浣i噾 + /// </summary> + public decimal AccumulatedChannlesRakePrice { get; set; } } public class ChannelRateOutput @@ -1110,9 +1114,22 @@ /// </summary> public string Link { get; set; } } + +public class LifePayConsumptionStatistics +{ + /// <summary> + /// 绱鎵f + /// </summary> + public decimal TotalDeductionAmount { get; set; } + + /// <summary> + /// 鍐荤粨涓� + /// </summary> + public decimal TotalFrozenAmount { get; set; } +} + public class LifePayRechargeReceiptsStatistics { - /// <summary> /// 绱鍏呭�� /// </summary> @@ -1152,6 +1169,60 @@ 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> + /// 鎵f閲戦 + /// </summary> + public decimal DeductionAmount { get; set; } + + /// <summary> + /// 鍐荤粨閲戦 + /// </summary> + public decimal FrozenAmount { get; set; } +} + public class LifePayPhoneMesssageCodeLoginOutput { /// <summary> @@ -1177,6 +1248,8 @@ public string ChannlesNum { get; set; } public Guid ChannlesId { get; set; } + + public LifePaySwitchTypeEnum SwitchType { get; set; } } public class BackClientUserInfoOutput @@ -1260,12 +1333,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> + /// 浣i噾 + /// </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 { @@ -1299,7 +1444,7 @@ /// <summary> /// 缁撶畻鏃堕棿 /// </summary> - public DateTime FinishTime { get; set; } + public DateTime? FinishTime { get; set; } /// <summary> /// 涓嬪崟鏃堕棿 @@ -1363,7 +1508,7 @@ /// <summary> /// 缁撶畻鏃堕棿 /// </summary> - public DateTime FinishTime { get; set; } + public DateTime? FinishTime { get; set; } [Name("缁撶畻鏃堕棿")] public string FinishTimeStr { get; set; } -- Gitblit v1.9.1