From 8cffc2cde22edfa1378f5d0e7b9780aa31c6e8ba Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期四, 12 六月 2025 14:06:12 +0800 Subject: [PATCH] pref:导出退款订单新增平台订单号 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs | 377 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 368 insertions(+), 9 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs index a595100..8a1c7d7 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayOutput.cs @@ -167,6 +167,11 @@ public string? ChannelName { get; set; } /// <summary> + /// 杩愯惀鍟� + /// </summary> + public string Operator { get; set; } + + /// <summary> /// 璁㈠崟绫诲瀷 /// </summary> public LifePayOrderTypeEnum LifePayOrderType { get; set; } @@ -284,9 +289,14 @@ public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } /// <summary> + /// 璁㈠崟鍙傛暟璇︽儏 + /// </summary> + public string OrderParamDetailJsonStr { get; set; } + + /// <summary> /// 瀹為檯鍒拌处閲戦 /// </summary> - public decimal ActualReceivedAmount { get; set; } + public decimal? ActualReceivedAmount { get; set; } public LifePayStatusEnum? ActualReceivedStatus { get; set; } } @@ -309,6 +319,17 @@ [Name("鍏呭�兼笭閬�")] public string ChannelName { get; set; } + + /// <summary> + /// 杩愯惀鍟� + /// </summary> + [Name("杩愯惀鍟�")] + public string Operator { get; set; } + + /// <summary> + /// 璁㈠崟鍙傛暟璇︽儏 + /// </summary> + public string OrderParamDetailJsonStr { get; set; } /// <summary> /// 涓嬪崟鏃堕棿 @@ -381,7 +402,6 @@ /// <summary> /// 璁㈠崟鐘舵�� /// </summary> - [Name("骞冲彴璁㈠崟鐘舵��")] public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } @@ -404,6 +424,148 @@ [Name("鏀粯娓犻亾娴佹按鍙�")] public string OutOrderNo { get; set; } + + //[Name("閫�娆剧敵璇�")] + //public string RefundApplyRemark { get; set; } + + ///// <summary> + ///// 璁㈠崟鐘舵�� + ///// </summary> + //public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + + [Name("骞冲彴璁㈠崟鐘舵��")] + public string LifePayOrderStatusStr { get; set; } + + /// <summary> + /// 瀹屾垚鏃堕棿 + /// </summary> + public DateTime? FinishTime { get; set; } + + [Name("瀹屾垚鏃堕棿")] + public string FinishTimeStr { get; set; } + + + +} + +public class LifePayOrderListTemplateForChannle +{ + + [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; } + + public string ChannelName { get; set; } + + /// <summary> + /// 杩愯惀鍟� + /// </summary> + [Name("杩愯惀鍟�")] + public string Operator { get; set; } + + /// <summary> + /// 涓嬪崟鏃堕棿 + /// </summary> + public DateTime CreationTime { get; set; } + + [Name("涓嬪崟鏃堕棿")] + public string CreationTimeStr { get; set; } + + [Name("骞冲彴璁㈠崟鍙�")] + public string OrderNo { get; set; } + + /// <summary> + /// 鍏呭�奸噾棰� + /// </summary> + public decimal RechargeAmount { get; set; } + + [Name("鍏呭�奸噾棰�")] + 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; } + + /// <summary> + /// 瀹炰粯閲戦 + /// </summary> + public decimal PayAmount { get; set; } + + [Name("鐢ㄦ埛瀹炰粯閲戦")] + public string PayAmountStr { get; set; } + + /// <summary> + /// 鏀粯鏃堕棿 + /// </summary> + public DateTime? PayTime { get; set; } + + [Name("鏀粯鏃堕棿")] + public string PayTimeStr { get; set; } + + [Name("鏀粯娓犻亾")] + public string LifePayTypeStr { get; set; } + + [Name("鏀粯娓犻亾娴佹按鍙�")] + public string OutOrderNo { get; set; } + + [Name("鏀粯鐘舵��")] + public string PayStatusStr { get; set; } + + public string ACOOLYOrderNo { get; set; } + + /// <summary> + /// 骞冲彴鎵f閲戦 + /// </summary> + public decimal PlatformPrice { get; set; } + + /// <summary> + /// 璁㈠崟鍙傛暟璇︽儏 + /// </summary> + public string OrderParamDetailJsonStr { get; set; } + + /// <summary> + /// 骞冲彴閫�娆剧姸鎬� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } + + public string? LifePayRefundStatusStr { get; set; } + + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + public LifePayOrderStatusEnum LifePayOrderStatus { get; set; } + + + + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> + /// 渚涘簲鍟嗚鍗曠姸鎬� + /// </summary> + public string? ACOOLYStatusStr { get; set; } + + /// <summary> + /// 鏀粯鐘舵�� + /// </summary> + public LifePayStatusEnum PayStatus { get; set; } //[Name("閫�娆剧敵璇�")] //public string RefundApplyRemark { get; set; } @@ -460,6 +622,9 @@ /// </summary> [Name("鐢宠閫�娆炬椂闂�")] public string? RefundApplyTimeStr { get; set; } + + [Name("骞冲彴璁㈠崟鍙�")] + public string OrderNo { get; set; } /// <summary> /// 涓嬪崟鏃堕棿 @@ -1096,6 +1261,10 @@ /// </summary> public int YesterdayActiveUsers { get; set; } + /// <summary> + /// 绱浣i噾 + /// </summary> + public decimal AccumulatedChannlesRakePrice { get; set; } } public class ChannelRateOutput @@ -1110,9 +1279,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,12 +1334,71 @@ 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> + /// 鎺ㄥ箍鍛業D + /// </summary> + public string PromoterIdNumber { get; set; } /// <summary> /// 鏄惁鏄悗鍙扮敤鎴� @@ -1177,6 +1418,8 @@ public string ChannlesNum { get; set; } public Guid ChannlesId { get; set; } + + public LifePaySwitchTypeEnum SwitchType { get; set; } } public class BackClientUserInfoOutput @@ -1260,12 +1503,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,12 +1614,12 @@ /// <summary> /// 缁撶畻鏃堕棿 /// </summary> - public DateTime FinishTime { get; set; } + public DateTime? FinishTime { get; set; } /// <summary> /// 涓嬪崟鏃堕棿 /// </summary> - public DateTime CreationTime { set; get; } + public DateTime CreationTime { get; set; } /// <summary> /// 鎷撳睍灞炴�� @@ -1321,6 +1636,50 @@ [Name("搴忓彿")] public int SerialNumber { get; set; } - [Name("鎵嬫満鍙�")] - public string PhoneNumber { get; set; } -} \ No newline at end of file + + /// <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