From d2c1a8bb55e26b10fb869c16eb2b3e7ba37a4b0e Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Wed, 24 Sep 2025 19:18:12 +0800 Subject: [PATCH] =?UTF-8?q?feat(tenpayv3):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E8=A2=AB=E7=AE=A1=E6=8E=A7?= =?UTF-8?q?=E8=83=BD=E5=8A=9B=E5=8F=8A=E5=8E=9F=E5=9B=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rchantLimitationsBySubMerchantIdRequest.cs | 0 ...chantLimitationsBySubMerchantIdResponse.cs | 50 ++++++++++++++++++- ...antLimitationsBySubMerchantIdResponse.json | 19 ------- ...antLimitationsBySubMerchantIdResponse.json | 25 ++++++++++ 4 files changed, 74 insertions(+), 20 deletions(-) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/{ => MerchantLimitations}/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdRequest.cs (100%) rename src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/{ => MerchantLimitations}/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs (58%) delete mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdRequest.cs similarity index 100% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdRequest.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdRequest.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs similarity index 58% rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs index ab9ca1e7..76d3d5f4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.cs @@ -1,3 +1,5 @@ +using System; + namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { /// @@ -17,12 +19,26 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models public string? LimitationReasonType { get; set; } /// - /// 获取或设置商户被管控原因描述。 + /// 获取或设置商户被管控原因。 /// [Newtonsoft.Json.JsonProperty("limitation_reason")] [System.Text.Json.Serialization.JsonPropertyName("limitation_reason")] public string? LimitationReason { get; set; } + /// + /// 获取或设置商户被管控原因描述。 + /// + [Newtonsoft.Json.JsonProperty("limitation_reason_describe")] + [System.Text.Json.Serialization.JsonPropertyName("limitation_reason_describe")] + public string? LimitationReasonDescription { get; set; } + + /// + /// 获取或设置商户被该原因管控的单据号。 + /// + [Newtonsoft.Json.JsonProperty("limitation_case_id")] + [System.Text.Json.Serialization.JsonPropertyName("limitation_case_id")] + public string? LimitationCaseId { get; set; } + /// /// 获取或设置商户被该原因管控的解脱路径。 /// @@ -30,6 +46,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [System.Text.Json.Serialization.JsonPropertyName("recover_way")] public string? RecoverWay { get; set; } + /// + /// 获取或设置商户被该原因管控的解脱路径参数字符串。 + /// + [Newtonsoft.Json.JsonProperty("recover_way_param")] + [System.Text.Json.Serialization.JsonPropertyName("recover_way_param")] + public string? RecoverWayParametersString { get; set; } + /// /// 获取或设置商户被该原因管控的解脱帮助链接。 /// @@ -50,6 +73,31 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("other_relate_limitations")] [System.Text.Json.Serialization.JsonPropertyName("other_relate_limitations")] public string? OtherRelateLimitation { get; set; } + + /// + /// 获取或设置处置方式。 + /// + [Newtonsoft.Json.JsonProperty("limitation_action_type")] + [System.Text.Json.Serialization.JsonPropertyName("limitation_action_type")] + public string? LimitationActionType { get; set; } + + /// + /// 获取或设置预计管控开始时间。 + /// + [Newtonsoft.Json.JsonProperty("limitation_start_date")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("limitation_start_date")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset? LimitationStartDate { get; set; } + + /// + /// 获取或设置商户被该原因管控的时间。 + /// + [Newtonsoft.Json.JsonProperty("limitation_date")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("limitation_date")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset? LimitationDate { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json deleted file mode 100644 index f53c1b73..00000000 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "mchid": "123000110", - "limited_functions": [ - "NO_TRANSACTION_AND_RECHARGE" - ], - "recovery_specifications": [ - { - "limitation_reason": "经营证照异常", - "recover_way": "修改主体资料", - "recover_help_url": "https://kf.qq.com", - "limitation_reason_type": "LICENSE_ABNORMAL", - "relate_limitations": [ - "NO_TRANSACTION_AND_RECHARGE" - ], - "other_relate_limitations": "关闭相册扫码支付,关闭长按识别支付" - } - ], - "other_limited_functions": "关闭相册扫码支付,关闭长按识别支付" -} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json new file mode 100644 index 00000000..8ce8794e --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/MerchantOperationManage/MerchantLimitations/GetMerchantOperationManageMerchantLimitationsBySubMerchantIdResponse.json @@ -0,0 +1,25 @@ +{ + "mchid": "123000110", + "limited_functions": [ + "NO_TRANSACTION_AND_RECHARGEN" + ], + "other_limited_functions": "关闭相册扫码支付,关闭长按识别支付", + "recovery_specifications": [ + { + "limitation_case_id": "A20250819155047774441874", + "limitation_reason_type": "LICENSE_ABNORMAL", + "limitation_reason": "入驻后180天无账户动账", + "limitation_reason_describe": "当前商户号入驻后长时间无账户动账，请重新确认开户意愿并核实身份", + "relate_limitations": [ + "NO_TRANSACTION_AND_RECHARGE" + ], + "other_relate_limitations": "关闭相册扫码支付,关闭长按识别支付", + "recover_way": "MODIFY_SUBJECT_INFORMATION", + "recover_way_param": "100200300112233", + "recover_help_url": "https://kf.qq.com", + "limitation_action_type": "LIMIT_ACTION_TYPE_IMMEDIATE_CONTROL", + "limitation_start_date": "2025-06-08T10:34:56+08:00", + "limitation_date": "2025-06-08T10:34:56+08:00" + } + ] +}