From 9c2c0f8e00bd9df0f0eeb07ff62d9210bc94a945 Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期一, 24 三月 2025 17:59:46 +0800 Subject: [PATCH] fix:bug修复 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 148 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 147 insertions(+), 1 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs index bb116ab..978a80a 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs @@ -217,7 +217,32 @@ /// <summary> /// 涓嬪崟娓犻亾 /// </summary> - public Guid? ChannelId { get; set; } + public string? ChannelId { get; set; } + + + + /// <summary> + /// 骞冲彴鎶樻墸姣斾緥 + /// </summary> + public decimal PlatformRate { get; set; } + + public decimal PlatformDeductionAmount { get; set; } + + /// <summary> + /// 娓犻亾鎶樻墸 + /// </summary> + public decimal? ChannleRate { get; set; } + + /// <summary> + /// 娓犻亾浣i噾姣斾緥 + /// </summary> + public decimal? ChannlesRakeRate { get; set; } + + /// <summary> + /// 鎵嬬画璐规瘮渚� + /// </summary> + public decimal PremiumRate { get; set; } + } @@ -259,6 +284,11 @@ public LifePayStatusEnum? PayStatus { get; set; } /// <summary> + /// 渚涘簲鍟嗙姸鎬� + /// </summary> + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> /// 璁㈠崟鐘舵�� /// </summary> public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; } @@ -272,6 +302,78 @@ /// 缁撴潫瀹屾垚鏃堕棿 /// </summary> public DateTime? EndFinishTime { get; set; } + + /// <summary> + /// 寮�濮嬮��娆炬椂闂� + /// </summary> + public DateTime? BeginRefundTime { get; set; } + + /// <summary> + /// 缁撴潫閫�娆炬椂闂� + /// </summary> + public DateTime? EndRefundTime { get; set; } + + /// <summary> + /// 鐢ㄦ埛Id + /// </summary> + public Guid? UserId { get; set; } + + /// <summary> + /// 鎼滅储鍏抽敭璇� + /// </summary> + public string KeyWords { get; set; } + +} +public class QueryLifePayRefundOrderListInput : ChannelsBaseInput +{ + /// <summary> + /// 璁㈠崟绫诲瀷 + /// </summary> + public LifePayOrderTypeEnum? LifePayOrderType { get; set; } + + /// <summary> + /// 鐢熸椿缂磋垂鏀粯绫诲瀷 + /// </summary> + public LifePayTypeEnum? LifePayType { get; set; } + + /// <summary> + /// 寮�濮嬬敵璇烽��娆炬椂闂� + /// </summary> + public DateTime? BeginRefundApplyTime { get; set; } + + /// <summary> + /// 缁撴潫鐢宠閫�娆炬椂闂� + /// </summary> + public DateTime? EndRefundApplyTime { get; set; } + + /// <summary> + /// 寮�濮嬪畬鎴愭椂闂� + /// </summary> + public DateTime? BeginFinishTime { get; set; } + + /// <summary> + /// 缁撴潫瀹屾垚鏃堕棿 + /// </summary> + public DateTime? EndFinishTime { get; set; } + + /// <summary> + /// 鏀粯鐘舵�� + /// </summary> + public LifePayStatusEnum? PayStatus { get; set; } + + /// <summary> + /// 渚涘簲鍟嗙姸鎬� + /// </summary> + public ACOOLYStatusEnum? ACOOLYStatus { get; set; } + + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; } + /// <summary> + /// 璁㈠崟鐘舵�� + /// </summary> + public LifePayRefundStatusEnum? LifePayRefundStatus { get; set; } /// <summary> /// 鐢ㄦ埛Id @@ -289,10 +391,27 @@ { public Guid Id { get; set; } + /// <summary> + /// 涓婁紶鍑瘉 + /// </summary> public string RefundCredentialsImgUrl { get; set; } + /// <summary> + /// 閫�娆鹃┏鍥炲師鍥� + /// </summary> public string RefundCheckRemark { get; set; } + + /// <summary> + /// 閫�娆剧被鍨� + /// </summary> + public LifePayRefundTypeEnum LifePayRefundType { get; set; } + + /// <summary> + /// 閫�娆鹃噾棰� + /// </summary> + public decimal RefundPrice { get; set; } } + public class RefundUserLifePayOrderInput : ChannelsBaseInput { public Guid Id { get; set; } @@ -314,6 +433,8 @@ public string ChannlesNum { get; set; } public decimal ChannlesRate { get; set; } + + public decimal ChannlesRakeRate { get; set; } public LifePaySwitchTypeEnum SwitchType { get; set; } @@ -389,4 +510,29 @@ /// </summary> [StringLength(30, ErrorMessage = "澶囨敞淇℃伅浠呮敮鎸佸~鍐�30涓瓧绗︺��")] public string Remark { get; set; } = string.Empty; +} + +public class QueryUserPageInput : ChannelsBaseInput +{ + /// <summary> + /// 鎵嬫満鍙�/鐢ㄦ埛鍚� + /// </summary> + public string? QueryCondition { get; set; } + + /// <summary> + /// 娉ㄥ唽鏃堕棿 + /// </summary> + public DateTime? CreationTimeBegin { get; set; } + public DateTime? CreationTimeEnd { get; set; } +} + +public class Model_UserAccountExtraProperties +{ + public string? Name { get; set; } + + public string IspCode { get; set; } + + public string Phone { get; set; } + + public string Remark { get; set; } } \ No newline at end of file -- Gitblit v1.9.1