From ff1462c4d0c4c88b1ef801608284f01ac1e37761 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期四, 27 三月 2025 14:35:37 +0800 Subject: [PATCH] fix;获取充值流水接口查询条件优化 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs index f54f710..226d890 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs @@ -224,7 +224,9 @@ /// <summary> /// 骞冲彴鎶樻墸姣斾緥 /// </summary> - public decimal? PlatformRate { get; set; } + public decimal PlatformRate { get; set; } + + public decimal PlatformDeductionAmount { get; set; } /// <summary> /// 娓犻亾鎶樻墸 @@ -241,6 +243,17 @@ /// </summary> public decimal PremiumRate { get; set; } + +} + +public class UpdateLifePayOrderInput +{ + public Guid Id { get; set; } + + /// <summary> + /// 瀹為檯鍒拌处閲戦 + /// </summary> + public decimal ActualReceivedAmount { get; set; } } //public class ChannelsBaseInput : PageInput @@ -300,6 +313,8 @@ /// </summary> public DateTime? EndFinishTime { get; set; } + + /// <summary> /// 鐢ㄦ埛Id /// </summary> @@ -344,6 +359,16 @@ public DateTime? EndFinishTime { get; set; } /// <summary> + /// 寮�濮嬮��娆炬椂闂� + /// </summary> + public DateTime? BeginRefundTime { get; set; } + + /// <summary> + /// 缁撴潫閫�娆炬椂闂� + /// </summary> + public DateTime? EndRefundTime { get; set; } + + /// <summary> /// 鏀粯鐘舵�� /// </summary> public LifePayStatusEnum? PayStatus { get; set; } @@ -357,6 +382,10 @@ /// 璁㈠崟鐘舵�� /// </summary> public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; } + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } /// <summary> /// 鐢ㄦ埛Id @@ -503,10 +532,24 @@ public string? QueryCondition { get; set; } /// <summary> - /// 娉ㄥ唽鏃堕棿 + /// 娉ㄥ唽寮�濮嬫椂闂� /// </summary> public DateTime? CreationTimeBegin { get; set; } + + /// <summary> + /// 娉ㄥ唽缁撴潫鏃堕棿 + /// </summary> public DateTime? CreationTimeEnd { get; set; } + + /// <summary> + /// 鐧诲綍寮�濮嬫椂闂� + /// </summary> + public DateTime? LoginTimeBegin { get; set; } + + /// <summary> + /// 鐧诲綍缁撴潫鏃堕棿 + /// </summary> + public DateTime? LoginTimeEnd { get; set; } } public class Model_UserAccountExtraProperties @@ -518,4 +561,74 @@ public string Phone { get; set; } public string Remark { get; set; } +} + +public class OrderPriceReturn +{ + /// <summary> + /// 骞冲彴鎵f閲戦 + /// </summary> + public decimal PlatformPrice { get; set; } + + /// <summary> + /// 鎵嬬画璐� + /// </summary> + public decimal PremiumPrice { get; set; } + + /// <summary> + /// 娓犻亾浣i噾 + /// </summary> + public decimal ChannlesRakePrice { get; set; } + + /// <summary> + /// 鍒╂鼎 + /// </summary> + + public decimal Profit { get; set; } + +} + +public class LifePayRechargeReceiptsPageInput : ChannelsBaseInput +{ + /// <summary> + /// 鏌ヨ鏉′欢 + /// </summary> + public string? KeyWord { get; set; } + + /// <summary> + /// 璁拌处寮�濮嬫椂闂� + /// </summary> + public DateTime? CreationTimeBegin { get; set; } + + /// <summary> + /// 璁拌处缁撴潫鏃堕棿 + /// </summary> + public DateTime? CreationTimeEnd { get; set; } +} +public class AddUpdatePayRechargeReceiptsInput +{ + /// <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; } } \ No newline at end of file -- Gitblit v1.9.1