From 95798bbe8e398d3dd75926e18dfef2e14d1bc7cc Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 31 三月 2025 10:18:10 +0800
Subject: [PATCH] fix:流水分页数据返回结果更新
---
LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 324 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 322 insertions(+), 2 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index c9fe4a2..6a84270 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -102,6 +102,11 @@
/// 瀹㈡埛韬唤璇佸悗6浣嶏紝鍗楃綉蹇呬紶銆�
/// </summary>
public string SixID { get; set; }
+
+ /// <summary>
+ /// 鎴蜂富濮撳悕
+ /// </summary>
+ public string Name { get; set; }
}
public class LifeGasData
{
@@ -219,6 +224,41 @@
/// </summary>
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; }
+
+
+}
+
+public class UpdateLifePayOrderInput
+{
+ public Guid Id { get; set; }
+
+ /// <summary>
+ /// 瀹為檯鍒拌处閲戦
+ /// </summary>
+ public decimal ActualReceivedAmount { get; set; }
}
//public class ChannelsBaseInput : PageInput
@@ -259,6 +299,11 @@
public LifePayStatusEnum? PayStatus { get; set; }
/// <summary>
+ /// 渚涘簲鍟嗙姸鎬�
+ /// </summary>
+ public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+ /// <summary>
/// 璁㈠崟鐘舵��
/// </summary>
public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
@@ -272,6 +317,80 @@
/// 缁撴潫瀹屾垚鏃堕棿
/// </summary>
public DateTime? EndFinishTime { 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 DateTime? BeginRefundTime { get; set; }
+
+ /// <summary>
+ /// 缁撴潫閫�娆炬椂闂�
+ /// </summary>
+ public DateTime? EndRefundTime { 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,9 +408,25 @@
{
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
@@ -402,9 +537,24 @@
public string? QueryCondition { get; set; }
/// <summary>
- /// 娉ㄥ唽鏃堕棿
+ /// 娉ㄥ唽寮�濮嬫椂闂�
/// </summary>
- public DateTime? CreationTime { get; set; }
+ 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
@@ -416,4 +566,174 @@
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; }
+}
+
+
+public class SetPayTypeReturn
+{
+ public string Desc { get; set; }
+
+ public string OrderNo { get; set; }
+
+ public decimal PayAmount { get; set; }
+
+ public LifePayTypeEnum LifePayType { get; set; }
+}
+public class AddLifePayExpensesReceiptsInput
+{
+ /// <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; }
+}
+public class LifePayExpensesReceiptsPageInput : ChannelsBaseInput
+{
+ /// <summary>
+ /// 鏌ヨ鏉′欢
+ /// </summary>
+ public string? KeyWord { get; set; }
+
+ /// <summary>
+ /// 鏀粯娓犻亾
+ /// </summary>
+ public LifePayTypeEnum? LifePayType { get; set; }
+
+ /// <summary>
+ /// 鏀舵敮绫诲瀷
+ /// </summary>
+ public ExpensesReceiptsTypeEnum? ExpensesReceiptsType { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime? TimeBegin { get; set; }
+
+ /// <summary>
+ /// 浜ゆ槗缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime? TimeEnd { get; set; }
+}
+public class LifePayExpensesReceiptsTemp
+{
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ public string OrderNo { get; set; }
+
+ /// <summary>
+ /// 閫�娆捐鍗曠紪鍙�
+ /// </summary>
+ public string RefundOrderNo { 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; }
+
+ public string ExpensesReceiptsOrder { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1