From 5f1c741dc7ecfc26d256b2413cdf54e7c39f47e2 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 09:43:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentApi
---
LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs b/LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs
index a55ccd9..a09e3dc 100644
--- a/LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs
+++ b/LifePayment/LifePayment.Domain.Shared/ACOOLY/ACOOLYInput.cs
@@ -1,10 +1,7 @@
锘縰sing 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;
namespace LifePayment.Domain.Shared;
@@ -85,6 +82,21 @@
[JsonProperty("gasOrgType")]
public string GasOrgType { get; set; }
+}
+
+public class GasOrgTypeRequestInput : ACOOLYRequestBaseInput
+{
+ /// <summary>
+ /// 澶栭儴鍟嗘埛璁㈠崟鍙�
+ /// </summary>
+ [JsonProperty("outOrderNo")]
+ public string OutOrderNo { get; set; }
+
+ /// <summary>
+ /// 骞冲彴璁㈠崟鍙�
+ /// </summary>
+ [JsonProperty("busiOrderNo")]
+ public string BusiOrderNo { get; set; }
}
/// <summary>
@@ -231,8 +243,16 @@
[JsonProperty("name")]
public string Name { get; set; }
}
+public class ChannelsBaseInput : PageInput
+{
+ public string CheckChannelId { get; set; }
+}
-public class SetLifePayOrderPayTypeInput
+public class LogErrorInput
+{
+ public string Error { get; set; }
+}
+public class SetLifePayOrderPayTypeInput : ChannelsBaseInput
{
[Required(ErrorMessage = "璁㈠崟鍙蜂笉鍙负绌�")]
public string OrderNo { get; set; }
@@ -252,9 +272,10 @@
/// </summary>
public string Attach { get; set; }
+
}
-public class GetPayOrderForJsAPIInput
+public class GetPayOrderForJsAPIInput : ChannelsBaseInput
{
[Required(ErrorMessage = "璁㈠崟鍙蜂笉鍙负绌�")]
public string OrderNo { get; set; }
@@ -272,4 +293,11 @@
/// </summary>
public string Attach { get; set; }
+ /// <summary>
+ /// 鏀粯搴旂敤鐨刟ppId
+ /// </summary>
+ public string PayAppId { get; set; }
+
+ //public string CheckChannelId { get; set; }
+
}
\ No newline at end of file
--
Gitblit v1.9.1