From 02f5cf149ac0fecd8c7ee67bf57fb814d8464ba4 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期三, 02 四月 2025 16:31:09 +0800 Subject: [PATCH] fix:统计bug修复 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 663 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 641 insertions(+), 22 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index a5476ae..f2ab0af 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using ZeroD.Base.Web.Models; +using ZeroD.Util; namespace LifePayment.Application.Contracts; @@ -153,7 +154,7 @@ /// <summary> /// 鐢ㄦ埛鎵嬫満鍙� /// </summary> - public string PhoneNumber { get; set; } + public string? PhoneNumber { get; set; } /// <summary> /// 鐢熸椿缂磋垂鏀粯绫诲瀷 @@ -163,7 +164,7 @@ /// <summary> /// 娓犻亾鍚嶇О /// </summary> - public string ChannelName { get; set; } + public string? ChannelName { get; set; } /// <summary> /// 璁㈠崟绫诲瀷 @@ -174,6 +175,11 @@ /// 璁㈠崟鍙� /// </summary> public string OrderNo { get; set; } + + /// <summary> + /// 閫�娆捐鍗曞彿 + /// </summary> + public string? RefundOrderNo { get; set; } /// <summary> /// 鍏呭�奸噾棰� @@ -232,6 +238,11 @@ public string RefundCredentialsImgUrl { get; set; } /// <summary> + /// 閫�娆鹃噾棰� + /// </summary> + public decimal? RefundPrice { get; set; } + + /// <summary> /// 涓嬪崟鏃堕棿 /// </summary> public DateTime CreationTime { get; set; } @@ -271,6 +282,13 @@ /// 骞冲彴閫�娆剧姸鎬� /// </summary> public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + /// <summary> + /// 瀹為檯鍒拌处閲戦 + /// </summary> + public decimal ActualReceivedAmount { get; set; } + + public LifePayStatusEnum? ActualReceivedStatus { get; set; } } public class LifePayOrderListTemplate @@ -312,6 +330,14 @@ public string RechargeAmountStr { get; set; } /// <summary> + /// 瀹為檯鍏呭�奸噾棰� + /// </summary> + public decimal ActualRechargeAmount { get; set; } + + [Name("瀹為檯鍏呭�奸噾棰�")] + public string ActualRechargeAmountStr { get; set; } + + /// <summary> /// 浼樻儬閲戦 /// </summary> public decimal DiscountAmount { get; set; } @@ -339,6 +365,36 @@ public string ACOOLYOrderNo { get; set; } /// <summary> + /// 骞冲彴鎵f閲戦 + /// </summary> + [Name("骞冲彴鎵f閲戦")] + public decimal PlatformPrice { get; set; } + + /// <summary> + /// 骞冲彴閫�娆剧姸鎬� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + [Name("骞冲彴閫�娆剧姸鎬�")] + public string? LifePayRefundStatusStr { get; set; } + + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + [Name("骞冲彴璁㈠崟鐘舵��")] + public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + + + + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> + /// 渚涘簲鍟嗚鍗曠姸鎬� + /// </summary> + [Name("渚涘簲鍟嗚鍗曠姸鎬�")] + public string? ACOOLYStatusStr { get; set; } + + /// <summary> /// 鏀粯鐘舵�� /// </summary> public LifePayStatusEnum PayStatus { get; set; } @@ -349,15 +405,15 @@ [Name("鏀粯娓犻亾娴佹按鍙�")] public string OutOrderNo { get; set; } - [Name("閫�娆剧敵璇�")] - public string RefundApplyRemark { get; set; } + //[Name("閫�娆剧敵璇�")] + //public string RefundApplyRemark { get; set; } - /// <summary> - /// 璁㈠崟鐘舵�� - /// </summary> - public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + ///// <summary> + ///// 璁㈠崟鐘舵�� + ///// </summary> + //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } - [Name("璁㈠崟鐘舵��")] + [Name("骞冲彴璁㈠崟鐘舵��")] public string LifePayOrderStatusStr { get; set; } /// <summary> @@ -370,10 +426,115 @@ - - } + +public class LifePayRefundOrderListTemplate +{ + + [Name("搴忓彿")] + public int? SerialNumber { get; set; } + + [Name("鎵嬫満鍙�")] + public string? PhoneNumber { get; set; } + + public LifePayTypeEnum? LifePayType { get; set; } + + public LifePayOrderTypeEnum? LifePayOrderType { get; set; } + + [Name("鍏呭�肩被鍨�")] + public string? LifePayOrderTypeStr { get; set; } + + [Name("鍏呭�兼笭閬�")] + public string? ChannelName { get; set; } + + + + /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + public DateTime? RefundApplyTime { get; set; } + + /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + [Name("鐢宠閫�娆炬椂闂�")] + public string? RefundApplyTimeStr { get; set; } + + /// <summary> + /// 涓嬪崟鏃堕棿 + /// </summary> + public DateTime CreationTime { get; set; } + + + [Name("閫�娆捐鍗曞彿")] + public string? RefundOrderNo { get; set; } + + + [Name("閫�娆剧敵璇�")] + public string? RefundApplyRemark { get; set; } + + [Name("鍏呭�奸噾棰�")] + public string? RechargeAmountStr { get; set; } + + + /// <summary> + /// 鍏呭�奸噾棰� + /// </summary> + public decimal RechargeAmount { get; set; } + + /// <summary> + /// 瀹為檯鍒拌处閲戦 + /// </summary> + [Name("瀹為檯鍒拌处閲戦")] + public string? ActualReceivedAmount { get; set; } + + /// <summary> + /// 瀹炰粯閲戦 + /// </summary> + public decimal PayAmount { get; set; } + + [Name("瀹炰粯閲戦")] + public string? PayAmountStr { get; set; } + + [Name("閫�娆炬笭閬�")] + public string LifePayTypeStr { get; set; } + + /// <summary> + /// 閫�娆鹃噾棰� + /// </summary> + [Name("閫�娆鹃噾棰�")] + public decimal? RefundPrice { get; set; } + + + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> + /// 渚涘簲鍟嗚鍗曠姸鎬� + /// </summary> + [Name("渚涘簲鍟嗚鍗曠姸鎬�")] + public string? ACOOLYStatusStr { get; set; } + + + /// <summary> + /// 瀹屾垚鏃堕棿 + /// </summary> + public DateTime? FinishTime { get; set; } + + + /// <summary> + /// 骞冲彴閫�娆剧姸鎬� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + [Name("骞冲彴閫�娆剧姸鎬�")] + public string? LifePayRefundStatusStr { get; set; } + + [Name("瀹屾垚鏃堕棿")] + public string? FinishTimeStr { get; set; } + + +} public class UserLifePayOrderOutput { public Guid Id { get; set; } @@ -444,6 +605,11 @@ public DateTime? RefundTime { get; set; } /// <summary> + /// 閫�娆剧敵璇锋椂闂� + /// </summary> + public DateTime? RefundApplyTime { get; set; } + + /// <summary> /// 閫�娆惧嚟璇� /// </summary> public string RefundCredentialsImgUrl { get; set; } @@ -452,10 +618,21 @@ public string RefundApplyRemark { get; set; } public string RefundCheckRemark { get; set; } + /// <summary> /// 娓犻亾娴佹按鍙� /// </summary> public string ACOOLYOrderNo { get; set; } + + /// <summary> + /// 骞冲彴閫�娆剧姸鎬� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + /// <summary> + /// 骞冲彴鐘舵�� + /// </summary> + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } } public class LifePayOrderOutput @@ -615,7 +792,7 @@ /// <summary> /// 鎵嬬画璐规瘮渚� /// </summary> - public decimal PremiumRate { get; set; } + public decimal? PremiumRate { get; set; } /// <summary> /// 鎵嬬画璐� @@ -631,6 +808,11 @@ /// 鍥炲崟鍦板潃 /// </summary> public string? ElecBillUrl { get; set; } + + /// <summary> + /// 閫�娆惧洖鍗曞湴鍧� + /// </summary> + public string? RefundElecBillUrl { get; set; } } public class LifePayRefundOrderOutput { @@ -753,6 +935,11 @@ public decimal? ActualRechargeAmount { get; set; } /// <summary> + /// 瀹為檯鍒拌处閲戦 + /// </summary> + public decimal? ActualReceivedAmount { get; set; } + + /// <summary> /// 閫�娆鹃噾棰� /// </summary> public decimal? RefundPrice { get; set; } @@ -762,6 +949,11 @@ /// 鍥炲崟鍦板潃 /// </summary> public string? ElecBillUrl { get; set; } + + /// <summary> + /// 閫�娆惧洖鍗曞湴鍧� + /// </summary> + public string? RefundElecBillUrl { get; set; } } public class CreateLifePayOrderOutput { @@ -849,48 +1041,475 @@ public class TopStatisticsOutput { /// <summary> + /// 鍒涘缓鏃堕棿 + /// </summary> + public DateTime CreationTime { get; set; } + + /// <summary> /// 璐︽埛浣欓 /// </summary> - public string Amount { get; set; } + public decimal Amount { get; set; } /// <summary> /// 绱鏀舵 /// </summary> - public string AccumulatedReceipts { get; set; } + public decimal AccumulatedReceipts { get; set; } /// <summary> /// 鏄ㄦ棩鏀舵 /// </summary> - public string ReceiptsYesterda { get; set; } + public decimal ReceiptsYesterday { get; set; } + + + /// <summary> + /// 绱鏀跺叆 + /// </summary> + public decimal AccumulatedIncome { get; set; } /// <summary> /// 绱涓嬪崟 /// </summary> - public string AccumulatedOrders { get; set; } + public int AccumulatedOrders { get; set; } /// <summary> /// 鏄ㄦ棩涓嬪崟 /// </summary> - public string OrdersNumYesterda { get; set; } + public int OrdersNumYesterday { get; set; } /// <summary> /// 鏄ㄦ棩鎴愬姛 /// </summary> - public string YesterdaSuccess { get; set; } + public int YesterdaySuccess { get; set; } /// <summary> /// 鏄ㄦ棩澶辫触 /// </summary> - public string YesterdaFail { get; set; } + public int YesterdayFail { get; set; } /// <summary> /// 绱鐢ㄦ埛 /// </summary> - public string AccumulatedUsers { get; set; } + public int AccumulatedUsers { get; set; } /// <summary> /// 鏄ㄦ棩娲昏穬鐢ㄦ埛 /// </summary> - public string YesterdayActiveUsers { get; set; } + public int YesterdayActiveUsers { get; set; } -} \ No newline at end of file + /// <summary> + /// 绱浣i噾 + /// </summary> + public decimal AccumulatedChannlesRakePrice { get; set; } +} + +public class ChannelRateOutput +{ + public decimal ChannlesRate { get; set; } +} + +public class OnlineServiceInput +{ + /// <summary> + /// 鍦ㄧ嚎瀹㈡湇閾炬帴 + /// </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> + public decimal TotalRechargeAmount { get; set; } +} + +public class LifePayRechargeReceiptsListOutput +{ + /// <summary> + /// 缂栧彿 + /// </summary> + public Guid Id { get; set; } + + /// <summary> + /// 涓氬姟璁㈠崟鍙� + /// </summary> + public string OrderNo { get; set; } + + /// <summary> + /// 鍏呭�奸噾棰� + /// </summary> + public decimal RechargeAmount { get; set; } + + /// <summary> + /// 澶囨敞 + /// </summary> + public string Remark { get; set; } + + /// <summary> + /// 鍑瘉 + /// </summary> + public string Voucher { get; set; } + + /// <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> + /// 鎵f閲戦 + /// </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> + /// 鍚堣浣i噾 + /// </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> + /// 浣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 +{ + + /// <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 { 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> + /// 娓犻亾浣i噾姣斾緥 + /// </summary> + public decimal ChannlesRakeRate { get; set; } + + [Name("浣i噾姣斾緥")] + public string ChannlesRakeRateStr { get; set; } + + /// <summary> + /// 浣i噾 + /// </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