From ff1462c4d0c4c88b1ef801608284f01ac1e37761 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期四, 27 三月 2025 14:35:37 +0800
Subject: [PATCH] fix；获取充值流水接口查询条件优化

---
 LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs |  423 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 415 insertions(+), 8 deletions(-)

diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
index ff0ce6d..226d890 100644
--- a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
+++ b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs
@@ -1,18 +1,21 @@
 锘縰sing LifePayment.Domain.Shared;
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using ZeroD.Util;
+using static LifePayment.Domain.Shared.LifePaymentConstant;
 
 namespace LifePayment.Application.Contracts;
 
-public class CreateLifePayOrderInput<T> where T : class
+public class CreateLifePayOrderInput<T> : ChannelsBaseInput where T : class
 {
     public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 娓犻亾鍚嶇О
+    /// </summary>
+    public string ChannelId { get; set; }
+
+    //public string CheckChannelId { get; set; }
 
     ///// <summary>
     ///// 鐢熸椿缂磋垂鏀粯绫诲瀷
@@ -42,6 +45,7 @@
     /// 鎵嬫満鍙枫��
     /// </summary>
     [Required(ErrorMessage = "鎵嬫満鍙锋槸蹇呭～椤广��")]
+    [RegularExpression(RegularExpression.PhoneNumberRegEx, ErrorMessage = "鎵嬫満鍙锋牸寮忎笉姝ｇ‘")]
     [JsonProperty("phone")]
     public string Phone { get; set; }
 
@@ -77,7 +81,7 @@
     /// 鐢佃垂鎴峰彿銆�
     /// </summary>
     [Required(ErrorMessage = "鐢佃垂鎴峰彿鏄繀濉」銆�")]
-    [StringLength(50, ErrorMessage = "鐢佃垂鎴峰彿闀垮害涓嶈兘瓒呰繃50涓瓧绗︺��")]
+    [RegularExpression(RegularExpression.ElectricAccountRegEx, ErrorMessage = "璇疯緭鍏�13浣嶇數缃戞埛鍙�")]
     public string ElectricAccount { get; set; }
 
     /// <summary>
@@ -98,6 +102,42 @@
     /// 瀹㈡埛韬唤璇佸悗6浣嶏紝鍗楃綉蹇呬紶銆�
     /// </summary>
     public string SixID { get; set; }
+}
+public class LifeGasData
+{
+    /// <summary>
+    /// 鍏呭�奸潰棰濓紝鍗曚綅涓哄厓銆�
+    /// </summary>
+    [Required(ErrorMessage = "鍏呭�奸潰棰濇槸蹇呭～椤广��")]
+    public decimal ParValue { get; set; }
+
+    /// <summary>
+    /// 澶╃劧姘斿叕鍙哥被鍨嬶紝"zhong_ran"浠ｈ〃涓噧鐕冩皵锛�"bei_jing"浠ｈ〃鍖椾含鐕冩皵銆�
+    /// </summary>
+    [Required(ErrorMessage = "鐕冩皵绫诲瀷鏄繀濉」銆�")]
+    public string GasOrgType { get; set; }
+
+
+    /// <summary>
+    /// 鐕冩皵鎴峰彿
+    /// </summary>
+    [Required(ErrorMessage = "鐕冩皵鎴峰彿鏄繀濉」銆�")]
+    public string GasAccount { get; set; }
+
+    /// <summary>
+    /// 鐪佷唤
+    /// </summary>
+    [Required(ErrorMessage = "鐪佷唤鏄繀濉」銆�")]
+    [StringLength(20, ErrorMessage = "鐪佷唤闀垮害涓嶈兘瓒呰繃20涓瓧绗︺��")]
+    public string Province { get; set; }
+
+    /// <summary>
+    /// 鍩庡競
+    /// </summary>
+    //[Required(ErrorMessage = "鍩庡競鏄繀濉」銆�")]
+    [StringLength(20, ErrorMessage = "鍩庡競闀垮害涓嶈兘瓒呰繃20涓瓧绗︺��")]
+    public string City { get; set; }
+
 }
 
 public class CreateLifePayOrderInput
@@ -174,14 +214,69 @@
     /// </summary>
     public string OrderParamDetailJsonStr { get; set; }
 
+    /// <summary>
+    /// 涓嬪崟娓犻亾
+    /// </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>
+    /// 娓犻亾浣ｉ噾姣斾緥
+    /// </summary>
+    public decimal? ChannlesRakeRate { get; set; }
+
+    /// <summary>
+    /// 鎵嬬画璐规瘮渚�
+    /// </summary>
+    public decimal PremiumRate { get; set; }
+
+
 }
 
-public class QueryLifePayOrderListInput : PageInput
+public class UpdateLifePayOrderInput
+{
+    public Guid Id { get; set; }
+
+    /// <summary>
+    /// 瀹為檯鍒拌处閲戦
+    /// </summary>
+    public decimal ActualReceivedAmount { get; set; }
+}
+
+//public class ChannelsBaseInput : PageInput
+//{
+//    public string CheckChannelId { get; set; }
+//}
+
+public class GetPayStatusByOrderNoInput : ChannelsBaseInput
+{
+    public string OrderNo { get; set; }
+}
+
+public class QueryLifePayOrderListInput : ChannelsBaseInput
 {
     /// <summary>
     /// 璁㈠崟绫诲瀷
     /// </summary>
     public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
+
+    /// <summary>
+    /// 鐢熸椿缂磋垂鏀粯绫诲瀷
+    /// </summary>
+    public LifePayTypeEnum? LifePayType { get; set; }
 
     /// <summary>
     /// 寮�濮嬫敮浠樻椂闂�
@@ -199,6 +294,11 @@
     public LifePayStatusEnum? PayStatus { get; set; }
 
     /// <summary>
+    /// 渚涘簲鍟嗙姸鎬�
+    /// </summary>
+    public ACOOLYStatusEnum? ACOOLYStatus { get; set; }
+
+    /// <summary>
     /// 璁㈠崟鐘舵��
     /// </summary>
     public LifePayOrderStatusEnum? LifePayOrderStatus { get; set; }
@@ -213,15 +313,322 @@
     /// </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
+    /// </summary>
+    public Guid? UserId { get; set; }
+
+    /// <summary>
+    /// 鎼滅储鍏抽敭璇�
+    /// </summary>
+    public string KeyWords { get; set; }
+
 }
 
 public class RefundLifePayOrderInput
 {
     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; }
+
+    /// <summary>
+    /// 鐢ㄦ埛Id
+    /// </summary>
+    public Guid? UserId { get; set; }
+
+    public string RefundApplyRemark { get; set; }
+}
+
+public class CreateEditPayChannelsInput
+{
+    public Guid? Id { get; set; }
+
+    public string ChannlesName { get; set; }
+
+    public string ChannlesNum { get; set; }
+
+    public decimal ChannlesRate { get; set; }
+
+    public decimal ChannlesRakeRate { get; set; }
+
+    public LifePaySwitchTypeEnum SwitchType { get; set; }
+
+    public LifePayChannelsStatsEnum Status { get; set; }
+
+    public LifePayChannlesTypeEnum ChannlesType { get; set; }
+
+}
+
+public class QueryUserAccountListInput : ChannelsBaseInput
+{
+    /// <summary>
+    /// 鐢ㄦ埛Id
+    /// </summary>
+    public Guid? UserId { get; set; }
+
+
+    public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
+}
+
+public class QueryUserAccountAllListInput : ChannelsBaseInput
+{
+    /// <summary>
+    /// 鐢ㄦ埛Id
+    /// </summary>
+    public Guid? UserId { get; set; }
+
+    public LifePayOrderTypeEnum? LifePayOrderType { get; set; }
+}
+
+public class AddUpdateUserAccountInput : ChannelsBaseInput
+{
+    public Guid? Id { get; set; }
+
+    /// <summary>
+    /// 鐢ㄦ埛缂栧彿
+    /// </summary>
+    public Guid UserId { get; set; }
+
+    /// <summary>
+    /// 鐢熸椿缂磋垂绫诲瀷
+    /// </summary>
+    public LifePayOrderTypeEnum LifePayType { get; set; }
+
+    /// <summary>
+    /// 杩愯惀鍟�
+    /// </summary>
+    [Required(ErrorMessage = "杩愯惀鍟嗕笉鑳戒负绌猴紱")]
+    public string Operators { get; set; }
+
+    /// <summary>
+    /// 鎵嬫満鍙�/鎴峰彿
+    /// </summary>
+    public string Content { get; set; }
+
+    /// <summary>
+    /// 鐪�
+    /// </summary>
+    public string Province { get; set; }
+
+    /// <summary>
+    /// 甯�
+    /// </summary>
+    public string City { get; set; }
+
+    /// <summary>
+    /// 鎷撳睍瀛楁锛堢數璐圭被鍨嬶級
+    /// </summary>
+    public string ExtraProperties { get; set; }
+
+    /// <summary>
+    /// 澶囨敞
+    /// </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; }
+
+    /// <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
+{
+    public string? Name { get; set; }
+
+    public string IspCode { get; set; }
+
+    public string Phone { get; set; }
+
+    public string Remark { get; set; }
+}
+
+public class OrderPriceReturn
+{
+    /// <summary>
+    /// 骞冲彴鎵ｆ閲戦
+    /// </summary>
+    public decimal PlatformPrice { get; set; }
+
+    /// <summary>
+    /// 鎵嬬画璐�
+    /// </summary>
+    public decimal PremiumPrice { get; set; }
+
+    /// <summary>
+    /// 娓犻亾浣ｉ噾
+    /// </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; }
 }
\ No newline at end of file

--
Gitblit v1.9.1