From 70c08d5a565139b440b73d8b9d9c8c20c7942cd6 Mon Sep 17 00:00:00 2001 From: lingling <kety1122@163.com> Date: 星期五, 14 三月 2025 15:11:23 +0800 Subject: [PATCH] 添加逻辑 --- LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs | 181 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 173 insertions(+), 8 deletions(-) diff --git a/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs b/LifePayment/LifePayment.Application.Contracts/LifePay/LifePayInput.cs index ff0ce6d..bb116ab 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 = "鎵嬫満鍙锋牸寮忎笉姝g‘")] [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"浠h〃涓噧鐕冩皵锛�"bei_jing"浠h〃鍖椾含鐕冩皵銆� + /// </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,34 @@ /// </summary> public string OrderParamDetailJsonStr { get; set; } + /// <summary> + /// 涓嬪崟娓犻亾 + /// </summary> + public Guid? ChannelId { get; set; } + } -public class QueryLifePayOrderListInput : PageInput +//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> /// 寮�濮嬫敮浠樻椂闂� @@ -217,6 +277,12 @@ /// 鐢ㄦ埛Id /// </summary> public Guid? UserId { get; set; } + + /// <summary> + /// 鎼滅储鍏抽敭璇� + /// </summary> + public string KeyWords { get; set; } + } public class RefundLifePayOrderInput @@ -224,4 +290,103 @@ public Guid Id { get; set; } public string RefundCredentialsImgUrl { get; set; } + + public string RefundCheckRemark { 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 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; } \ No newline at end of file -- Gitblit v1.9.1