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 | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 232 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index cfce3b1..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
{
@@ -532,10 +538,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
@@ -572,4 +592,215 @@
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>
+ /// 鏌ヨ鏉′欢
+ /// </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 OutRefundNo { get; set; }
+
+ /// <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; }
+}
+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