From bd6dee346800b1d6a30329ec3ff46c5a97137c39 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 21 Apr 2025 19:54:53 +0800 Subject: [PATCH] =?UTF-8?q?chore(tenpayv2):=20=E6=9B=B4=E6=96=B0=E5=AE=98?= =?UTF-8?q?=E6=96=B9=E6=96=87=E6=A1=A3=E5=8F=82=E8=80=83=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WechatTenpayClientExecutePAPExtensions.cs | 13 ++- ...TenpayClientExecutePAPPartnerExtensions.cs | 30 ++++++- .../WechatTenpayClientParameterExtensions.cs | 8 +- .../Contract/DeletePAPPayContractRequest.cs | 16 +--- .../Contract/DeletePAPPayContractResponse.cs | 14 ---- .../DeletePAPPayPartnerContractRequest.cs | 72 +++++++++++++++++ .../DeletePAPPayPartnerContractResponse.cs | 79 +++++++++++++++++++ ...echatTenpayClientExecutePAPayExtensions.cs | 2 +- ...npayClientExecutePartnerPAPayExtensions.cs | 2 +- .../DeletePAPPayPartnerContractRequest.json | 10 +++ .../DeletePAPPayPartnerContractResponse.json | 9 +++ 11 files changed, 209 insertions(+), 46 deletions(-) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.cs create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.json diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPExtensions.cs index 17f8b0f8..87c76ab0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /papay/preentrustweb 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [GET] /papay/h5entrustweb 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -62,7 +62,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/contractorder 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -84,7 +84,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/pappayapply 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -106,9 +106,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /papay/deletecontract 接口。 /// /// REF:
- /// + /// ///
- /// REF" https://pay.weixin.qq.com/wiki/doc/api/wxpay_v2/papay/chapter5_9.shtml /// /// /// @@ -129,7 +128,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /papay/querycontract 接口。 /// /// REF:
- /// + /// ///
/// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPPartnerExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPPartnerExtensions.cs index 3c928710..7c4c85b0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPPartnerExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientExecutePAPPartnerExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /papay/partner/preentrustweb 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [GET] /papay/partner/h5entrustweb 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -83,7 +83,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 异步调用 [POST] /pay/partner/pappayapply 接口。 /// /// REF:
- /// + /// ///
/// /// @@ -101,11 +101,33 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } + /// + /// 异步调用 [POST] /papay/deletecontract 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteDeletePAPPayPartnerContractAsync(this WechatTenpayClient client, Models.DeletePAPPayPartnerContractRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + IFlurlRequest flurlReq = client + .CreateFlurlRequest(request, HttpMethod.Post, "papay", "deletecontract"); + + return await client.SendFlurlRequestAsXmlAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + /// /// 异步调用 [POST] /papay/partner/querycontract 接口。 /// /// REF:
- /// + /// ///
///
/// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs index 62cbab91..482a98dd 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Extensions/WechatTenpayClientParameterExtensions.cs @@ -183,7 +183,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端公众号唤起微信委托代扣的 URL。 /// /// REF:
- /// + /// ///
/// /// @@ -227,7 +227,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端公众号唤起微信委托代扣的 URL。 /// /// REF:
- /// + /// ///
/// /// @@ -275,7 +275,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序唤起微信委托代扣页面所需的参数字典。 /// /// REF:
- /// + /// ///
/// /// @@ -313,7 +313,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2 /// 生成客户端小程序唤起微信委托代扣页面所需的参数字典。 /// /// REF:
- /// + /// ///
/// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractRequest.cs index d8120b68..e5bcfdf4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractRequest.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models { /// /// 表示 [POST] /papay/deletecontract 接口的请求。 @@ -19,20 +19,6 @@ [System.Text.Json.Serialization.JsonPropertyName("appid")] public override string? AppId { get; set; } - /// - /// 获取或设置子商户号。 - /// - [Newtonsoft.Json.JsonProperty("sub_mch_id")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] - public string? SubMerchantId { get; set; } - - /// - /// 获取或设置子商户 AppId。 - /// - [Newtonsoft.Json.JsonProperty("sub_appid")] - [System.Text.Json.Serialization.JsonPropertyName("sub_appid")] - public string? SubAppId { get; set; } - /// /// 获取或设置接口版本号。 /// 默认值:1.0 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs index 87a083f9..256ea492 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAP/Contract/DeletePAPPayContractResponse.cs @@ -27,20 +27,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models #pragma warning restore CS8765 #pragma warning restore CS8618 - /// - /// 获取或设置子商户号。 - /// - [Newtonsoft.Json.JsonProperty("sub_mch_id")] - [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] - public string? SubMerchantId { get; set; } - - /// - /// 获取或设置子商户 AppId。 - /// - [Newtonsoft.Json.JsonProperty("sub_appid")] - [System.Text.Json.Serialization.JsonPropertyName("sub_appid")] - public string? SubAppId { get; set; } - /// /// 获取或设置接口版本号。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.cs new file mode 100644 index 00000000..4dbc0cf8 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.cs @@ -0,0 +1,72 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /papay/deletecontract 接口的请求。 + /// + public class DeletePAPPayPartnerContractRequest : WechatTenpaySignableRequest + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public override string? MerchantId { get; set; } + + /// + /// + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public override string? AppId { get; set; } + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置子商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("sub_appid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_appid")] + public string? SubAppId { get; set; } + + /// + /// 获取或设置接口版本号。 + /// 默认值:1.0 + /// + [Newtonsoft.Json.JsonProperty("version")] + [System.Text.Json.Serialization.JsonPropertyName("version")] + public string Version { get; set; } = "1.0"; + + /// + /// 获取或设置模板 ID。 + /// + [Newtonsoft.Json.JsonProperty("plan_id")] + [System.Text.Json.Serialization.JsonPropertyName("plan_id")] + public int? PlanId { get; set; } + + /// + /// 获取或设置签约协议号。 + /// + [Newtonsoft.Json.JsonProperty("contract_code")] + [System.Text.Json.Serialization.JsonPropertyName("contract_code")] + public string? Contract { get; set; } + + /// + /// 获取或设置委托代扣协议 ID。 + /// + [Newtonsoft.Json.JsonProperty("contract_id")] + [System.Text.Json.Serialization.JsonPropertyName("contract_id")] + public string? ContractId { get; set; } + + /// + /// 获取或设置解约备注。 + /// + [Newtonsoft.Json.JsonProperty("contract_termination_remark")] + [System.Text.Json.Serialization.JsonPropertyName("contract_termination_remark")] + public string TerminationRemark { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.cs new file mode 100644 index 00000000..261b346b --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV2/Models/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.cs @@ -0,0 +1,79 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV2.Models +{ + /// + /// 表示 [POST] /papay/deletecontract 接口的响应。 + /// + public class DeletePAPPayPartnerContractResponse : WechatTenpaySignableResponse + { + /// + /// + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string MerchantId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 + + /// + /// + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] +#pragma warning disable CS8618 +#pragma warning disable CS8765 + public override string AppId { get; set; } +#pragma warning restore CS8765 +#pragma warning restore CS8618 + + /// + /// 获取或设置子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mch_id")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置子商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("sub_appid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_appid")] + public string? SubAppId { get; set; } + + /// + /// 获取或设置接口版本号。 + /// + [Newtonsoft.Json.JsonProperty("version")] + [System.Text.Json.Serialization.JsonPropertyName("version")] + public string Version { get; set; } = default!; + + /// + /// 获取或设置模板 ID。 + /// + [Newtonsoft.Json.JsonProperty("plan_id")] + [System.Text.Json.Serialization.JsonPropertyName("plan_id")] + public int PlanId { get; set; } + + /// + /// 获取或设置签约协议号。 + /// + [Newtonsoft.Json.JsonProperty("contract_code")] + [System.Text.Json.Serialization.JsonPropertyName("contract_code")] + public string ContractCode { get; set; } = default!; + + /// + /// 获取或设置委托代扣协议 ID。 + /// + [Newtonsoft.Json.JsonProperty("contract_id")] + [System.Text.Json.Serialization.JsonPropertyName("contract_id")] + public string ContractId { get; set; } = default!; + + /// + /// 获取或设置解约备注。 + /// + [Newtonsoft.Json.JsonProperty("contract_termination_remark")] + [System.Text.Json.Serialization.JsonPropertyName("contract_termination_remark")] + public string TerminationRemark { get; set; } = default!; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePAPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePAPayExtensions.cs index 56f19a79..bef3baeb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePAPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePAPayExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// 异步调用 [POST] /papay/contracts/{contract_id}/notify 接口。 /// /// REF:
- /// + /// ///
///
/// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerPAPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerPAPayExtensions.cs index 6e6a4f59..b58b0bf2 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerPAPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerPAPayExtensions.cs @@ -12,7 +12,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 /// 异步调用 [POST] /partner-papay/contracts/{contract_id}/notify 接口。 /// /// REF:
- /// + /// ///
///
/// diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.json new file mode 100644 index 00000000..aa40d759 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractRequest.json @@ -0,0 +1,10 @@ +{ + "mch_id": "10000098", + "appid": "wxcbda96de0b165486", + "sub_mch_id": "10010405", + "sign": "E1EE61A91C8E90F299DE6AE075D60A2D", + "plan_id": "12251", + "contract_code": "1234", + "contract_termination_remark": "原因", + "version": "1.0" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.json new file mode 100644 index 00000000..a8b71523 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV2.UnitTests/ModelSamples/PAPPartner/Contract/DeletePAPPayPartnerContractResponse.json @@ -0,0 +1,9 @@ +{ + "return_code": "SUCCESS", + "result_code": "SUCCESS", + "sign": "C380BEC2BFD727A4B6845133519F3AD6", + "mch_id": "10010404", + "sub_mch_id": "10010405", + "appid": "wxcbda96de0b165486", + "contract_id": "100005698" +}