From f885db9e204c172c62779f45c3edee3cae463b8d Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期二, 01 四月 2025 16:00:33 +0800 Subject: [PATCH] Merge branch 'dev-lifepay-v1.3' of http://120.26.58.240:8888/r/LifePaymentApi into dev-lifepay-v1.3 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs index 545f42d..7190e9a 100644 --- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs +++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs @@ -2,6 +2,7 @@ using Newtonsoft.Json; using System; using System.ComponentModel.DataAnnotations; +using System.Collections.Generic; using static LifePayment.Domain.Shared.LifePaymentConstant; namespace LifePayment.Application.Contracts; @@ -592,7 +593,28 @@ public decimal Profit { get; set; } } +public class LifePayConsumptionPageInput : ChannelsBaseInput +{ + /// <summary> + /// 鏌ヨ鏉′欢 + /// </summary> + public string? KeyWord { get; set; } + /// <summary> + /// 璧勯噾娴佸悜 + /// </summary> + public ConsumptionFlowEnum? Flow { get; set; } + + /// <summary> + /// 璁拌处寮�濮嬫椂闂� + /// </summary> + public DateTime? TimeBegin { get; set; } + + /// <summary> + /// 璁拌处缁撴潫鏃堕棿 + /// </summary> + public DateTime? TimeEnd { get; set; } +} public class LifePayRechargeReceiptsPageInput : ChannelsBaseInput { /// <summary> @@ -651,6 +673,12 @@ } public class AddLifePayExpensesReceiptsInput { + + /// <summary> + /// 閫�娆捐鍗曞彿 + /// </summary> + public string OutRefundNo { get; set; } + /// <summary> /// 骞冲彴璁㈠崟鍙� /// </summary> @@ -771,3 +799,8 @@ public DateTime? FinishTimeEnd { get; set; } } + +public class TopStatisticsInput +{ + public List<string>? ChannleList { get; set; } +} \ No newline at end of file -- Gitblit v1.9.1