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 | 135 ++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 132 insertions(+), 3 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index 79ca73e..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;
@@ -102,6 +103,11 @@
/// 瀹㈡埛韬唤璇佸悗6浣嶏紝鍗楃綉蹇呬紶銆�
/// </summary>
public string SixID { get; set; }
+
+ /// <summary>
+ /// 鎴蜂富濮撳悕
+ /// </summary>
+ public string Name { get; set; }
}
public class LifeGasData
{
@@ -587,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>
@@ -646,6 +673,12 @@
}
public class AddLifePayExpensesReceiptsInput
{
+
+ /// <summary>
+ /// 閫�娆捐鍗曞彿
+ /// </summary>
+ public string OutRefundNo { get; set; }
+
/// <summary>
/// 骞冲彴璁㈠崟鍙�
/// </summary>
@@ -664,14 +697,110 @@
/// <summary>
/// 鏀舵敮绫诲瀷
/// </summary>
- public ExpensesReceiptsTypeEnum ExpensesReceiptsType { get; set; }
+ public ExpensesReceiptsTypeEnum? ExpensesReceiptsType { get; set; }
/// <summary>
/// 浜ゆ槗閲戦
/// </summary>
public decimal Amount { get; set; }
+}
+public class LifePayExpensesReceiptsPageInput : ChannelsBaseInput
+{
/// <summary>
- /// 鎷撳睍灞炴��
+ /// 鏌ヨ鏉′欢
/// </summary>
- public string ExtraProperties { get; set; }
+ 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; }
+}
+public class LifePayChannlesRakePageInput : ChannelsBaseInput
+{
+
+ /// <summary>
+ /// 鏌ヨ鏉′欢
+ /// </summary>
+ public string? KeyWord { get; set; }
+
+ /// <summary>
+ /// 娓犻亾鍙�
+ /// </summary>
+ public string? ChannelId { get; set; }
+
+ /// <summary>
+ /// 璧峰涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime? CreationTimeBegin { get; set; }
+
+ /// <summary>
+ /// 缁撴潫涓嬪崟鏃堕棿
+ /// </summary>
+ public DateTime? CreationTimeEnd { get; set; }
+
+ /// <summary>
+ /// 璧峰缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime? FinishTimeBegin { get; set; }
+
+ /// <summary>
+ /// 缁堟缁撶畻鏃堕棿
+ /// </summary>
+ public DateTime? FinishTimeEnd { get; set; }
+
+}
+
+public class TopStatisticsInput
+{
+ public List<string>? ChannleList { get; set; }
}
\ No newline at end of file
--
Gitblit v1.9.1