diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantRequest.cs index 804e85c7..ead8ab61 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantRequest.cs @@ -129,6 +129,23 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [System.Text.Json.Serialization.JsonPropertyName("number")] public string? IdNumber { get; set; } } + + public class H5PaymentApplyment + { + /// + /// 获取或设置网站 URL。 + /// + [Newtonsoft.Json.JsonProperty("website_url")] + [System.Text.Json.Serialization.JsonPropertyName("website_url")] + public string? WebsiteUrl { get; set; } + + /// + /// 获取或设置域名列表。 + /// + [Newtonsoft.Json.JsonProperty("domains")] + [System.Text.Json.Serialization.JsonPropertyName("domains")] + public IList? DomainList { get; set; } + } } /// @@ -256,5 +273,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [Newtonsoft.Json.JsonProperty("principal")] [System.Text.Json.Serialization.JsonPropertyName("principal")] public Types.Principal? Principal { get; set; } + + /// + /// 获取或设置是否申请开通 H5 支付权限。 + /// + [Newtonsoft.Json.JsonProperty("apply_h5_payment")] + [System.Text.Json.Serialization.JsonPropertyName("apply_h5_payment")] + public bool? IsApplyH5Payment { get; set; } + + /// + /// 获取或设置 H5 支付权限申请信息。 + /// + [Newtonsoft.Json.JsonProperty("h5_payment_apply_info")] + [System.Text.Json.Serialization.JsonPropertyName("h5_payment_apply_info")] + public Types.H5PaymentApplyment? H5PaymentApplyment { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantResponse.cs index f3ec07fa..750b2509 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/AddSubMerchantResponse.cs @@ -25,5 +25,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [Newtonsoft.Json.JsonProperty("description")] [System.Text.Json.Serialization.JsonPropertyName("description")] public string? VerificationStatusDescription { get; set; } + + /// + /// 获取或设置 H5 支付认证状态。 + /// + [Newtonsoft.Json.JsonProperty("h5_authorization_state")] + [System.Text.Json.Serialization.JsonPropertyName("h5_authorization_state")] + public string? H5AuthorizationState { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/GetSubMerchantResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/GetSubMerchantResponse.cs index 499f6ca9..3cb23650 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/GetSubMerchantResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/GetSubMerchantResponse.cs @@ -120,6 +120,74 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [System.Text.Json.Serialization.JsonPropertyName("number")] public string? IdNumber { get; set; } } + + public class H5PaymentState + { + /// + /// 获取或设置联系人姓名。 + /// + [Newtonsoft.Json.JsonProperty("name")] + [System.Text.Json.Serialization.JsonPropertyName("name")] + public string? ContactName { get; set; } + + /// + /// 获取或设置审核拒绝原因。 + /// + [Newtonsoft.Json.JsonProperty("audit_reject_detail")] + [System.Text.Json.Serialization.JsonPropertyName("audit_reject_detail")] + public string? AuditRejectDetail { get; set; } + + /// + /// 获取或设置 H5 支付认证状态。 + /// + [Newtonsoft.Json.JsonProperty("h5_authorization_state")] + [System.Text.Json.Serialization.JsonPropertyName("h5_authorization_state")] + public string? H5AuthorizationState { get; set; } + } + + public class SubMerchantState + { + public static class Types + { + public class ApplicationRejectDetail + { + /// + /// 获取或设置字段。 + /// + [Newtonsoft.Json.JsonProperty("field")] + [System.Text.Json.Serialization.JsonPropertyName("field")] + public string? Field { get; set; } + + /// + /// 获取或设置原因。 + /// + [Newtonsoft.Json.JsonProperty("reason")] + [System.Text.Json.Serialization.JsonPropertyName("reason")] + public string? Reason { get; set; } + } + } + + /// + /// 获取或设置子商户状态。 + /// + [Newtonsoft.Json.JsonProperty("sub_merchant_status")] + [System.Text.Json.Serialization.JsonPropertyName("sub_merchant_status")] + public string? SubMerchantStatus { get; set; } + + /// + /// 获取或设置申请状态。 + /// + [Newtonsoft.Json.JsonProperty("application_status")] + [System.Text.Json.Serialization.JsonPropertyName("application_status")] + public string? ApplicationStatus { get; set; } + + /// + /// 获取或设置申请拒绝原因。 + /// + [Newtonsoft.Json.JsonProperty("application_reject_detail")] + [System.Text.Json.Serialization.JsonPropertyName("application_reject_detail")] + public Types.ApplicationRejectDetail? ApplicationRejectDetail { get; set; } + } } /// @@ -220,5 +288,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [Newtonsoft.Json.JsonProperty("principal")] [System.Text.Json.Serialization.JsonPropertyName("principal")] public Types.Principal? Principal { get; set; } + + /// + /// 获取或设置 H5 支付权限状态信息。 + /// + [Newtonsoft.Json.JsonProperty("h5_payment")] + [System.Text.Json.Serialization.JsonPropertyName("h5_payment")] + public Types.H5PaymentState? H5PaymentState { get; set; } + + /// + /// 获取或设置子商户状态信息。 + /// + [Newtonsoft.Json.JsonProperty("sub_merchant_state")] + [System.Text.Json.Serialization.JsonPropertyName("sub_merchant_state")] + public Types.SubMerchantState? SubMerchantState { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantRequest.cs index f413a389..a8305b0c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantRequest.cs @@ -22,6 +22,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models public class Principal : AddSubMerchantRequest.Types.Principal { } + + public class H5PaymentApplyment : AddSubMerchantRequest.Types.H5PaymentApplyment + { + } } /// @@ -149,5 +153,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [Newtonsoft.Json.JsonProperty("principal")] [System.Text.Json.Serialization.JsonPropertyName("principal")] public Types.Principal? Principal { get; set; } + + /// + /// 获取或设置是否申请开通 H5 支付权限。 + /// + [Newtonsoft.Json.JsonProperty("apply_h5_payment")] + [System.Text.Json.Serialization.JsonPropertyName("apply_h5_payment")] + public bool? IsApplyH5Payment { get; set; } + + /// + /// 获取或设置 H5 支付权限申请信息。 + /// + [Newtonsoft.Json.JsonProperty("h5_payment_apply_info")] + [System.Text.Json.Serialization.JsonPropertyName("h5_payment_apply_info")] + public Types.H5PaymentApplyment? H5PaymentApplyment { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantResponse.cs index 767bd491..0c3dbbd4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Models/_Partner/Merchants/ModifySubMerchantResponse.cs @@ -11,5 +11,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Models [Newtonsoft.Json.JsonProperty("sub_mchid")] [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] public string SubMerchantId { get; set; } = default!; + + /// + /// 获取或设置 H5 支付认证状态。 + /// + [Newtonsoft.Json.JsonProperty("h5_authorization_state")] + [System.Text.Json.Serialization.JsonPropertyName("h5_authorization_state")] + public string? H5AuthorizationState { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Global/_Partner/Merchants/GetSubMerchantResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Global/_Partner/Merchants/GetSubMerchantResponse.json index 50b780a3..e9e8aca8 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Global/_Partner/Merchants/GetSubMerchantResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Global/_Partner/Merchants/GetSubMerchantResponse.json @@ -1,4 +1,4 @@ -{ +{ "sub_mchid": "20000100", "name": "test mcherchan_name", "shortname": "mcherchan_name", @@ -12,5 +12,11 @@ "principal": { "name": "Bob", "number": "5555-8888" + }, + "h5_payment": { + "h5_authorization_state": "APPROVED" + }, + "sub_merchant_state": { + "sub_merchant_status": "OPERATING" } }