diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e6d474c..93940ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -547,6 +547,10 @@ [展开查看] +- Release 2.19.0 + + - **新增**：新增电商收付通注销申请相关接口。 + - Release 2.18.0 - **新增**：新增电商收付通合单代扣相关接口。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs index e60e9a2e..83d78798 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs @@ -8,6 +8,75 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 { public static class WechatTenpayClientExecuteEcommerceExtensions { + #region Account + /// + /// 异步调用 [POST] /ecommerce/account/cancel-applications 接口。 + /// REF: https://pay.weixin.qq.com/docs/partner/apis/ecommerce-cancel/cancel-applications/create-cancel-application.html + /// + /// + /// + /// + /// + public static async Task ExecuteCreateEcommerceAccountCancelApplicationAsync(this WechatTenpayClient client, Models.CreateEcommerceAccountCancelApplicationRequest 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 + .CreateRequest(request, HttpMethod.Post, "ecommerce", "account", "cancel-applications"); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [GET] /ecommerce/account/cancel-applications/out-apply-no/{out_apply_no} 接口。 + /// REF: https://pay.weixin.qq.com/docs/partner/apis/ecommerce-cancel/cancel-applications/get-cancel-application.html + /// + /// + /// + /// + /// + public static async Task ExecuteGetEcommerceAccountCancelApplicationByOutApplyNumberAsync(this WechatTenpayClient client, Models.GetEcommerceAccountCancelApplicationByOutApplyNumberRequest 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 + .CreateRequest(request, HttpMethod.Get, "ecommerce", "account", "cancel-applications", "out-apply-no", request.OutApplyNumber); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } + + /// + /// 异步调用 [POST] /ecommerce/account/cancel-applications/media 接口。 + /// REF: https://pay.weixin.qq.com/docs/partner/apis/ecommerce-cancel/media/upload-media.html + /// + /// + /// + /// + /// + public static async Task ExecuteUploadEcommerceAccountCancelApplicationMediaAsync(this WechatTenpayClient client, Models.UploadEcommerceAccountCancelApplicationMediaRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + if (request.FileName == null) + request.FileName = Guid.NewGuid().ToString("N").ToLower() + ".png"; + + if (request.FileHash == null) + request.FileHash = BitConverter.ToString(Utilities.SHA256Utility.Hash(request.FileBytes)).Replace("-", string.Empty).ToLower(); + + if (request.FileContentType == null) + request.FileContentType = Utilities.FileNameToContentTypeMapper.GetContentTypeForImage(request.FileName!) ?? "image/png"; + + IFlurlRequest flurlReq = client + .CreateRequest(request, HttpMethod.Post, "ecommerce", "account", "cancel-applications", "media"); + + using var httpContent = Utilities.FileHttpContentBuilder.Build(fileName: request.FileName, fileBytes: request.FileBytes, fileContentType: request.FileContentType, fileMetaJson: client.JsonSerializer.Serialize(request)); + return await client.SendRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken); + } + #endregion + #region Applyments /// /// 异步调用 [POST] /ecommerce/applyments/ 接口。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.cs new file mode 100644 index 00000000..2c1ba592 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /ecommerce/account/cancel-applications 接口的请求。 + /// + public class CreateEcommerceAccountCancelApplicationRequest : WechatTenpayRequest + { + public static class Types + { + public class ApplicationMaterial + { + /// + /// 获取或设置申请材料类型。 + /// + [Newtonsoft.Json.JsonProperty("application_type")] + [System.Text.Json.Serialization.JsonPropertyName("application_type")] + public string Type { get; set; } = string.Empty; + + /// + /// 获取或设置申请材料 MediaId。 + /// + [Newtonsoft.Json.JsonProperty("application_media_id")] + [System.Text.Json.Serialization.JsonPropertyName("application_media_id")] + public string MediaId { get; set; } = string.Empty; + } + } + + /// + /// 获取或设置微信二级商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + public string SubMerchantId { get; set; } = string.Empty; + + /// + /// 获取或设置商户注销申请单号。 + /// + [Newtonsoft.Json.JsonProperty("out_apply_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_apply_no")] + public string OutApplyNumber { get; set; } = string.Empty; + + /// + /// 获取或设置注销申请材料列表。 + /// + [Newtonsoft.Json.JsonProperty("application_info")] + [System.Text.Json.Serialization.JsonPropertyName("application_info")] + public IList ApplicationMaterialList { get; set; } = new List(); + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.cs new file mode 100644 index 00000000..ec3d0082 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.cs @@ -0,0 +1,9 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /ecommerce/account/cancel-applications 接口的响应。 + /// + public class CreateEcommerceAccountCancelApplicationResponse : GetEcommerceAccountCancelApplicationByOutApplyNumberResponse + { + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberRequest.cs new file mode 100644 index 00000000..80bc4476 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberRequest.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /ecommerce/account/cancel-applications/out-apply-no/{out_apply_no} 接口的请求。 + /// + public class GetEcommerceAccountCancelApplicationByOutApplyNumberRequest : WechatTenpayRequest + { + /// + /// 获取或设置商户注销申请单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string OutApplyNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.cs new file mode 100644 index 00000000..c89b4960 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.cs @@ -0,0 +1,47 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /ecommerce/account/cancel-applications/out-apply-no/{out_apply_no} 接口的响应。 + /// + public class GetEcommerceAccountCancelApplicationByOutApplyNumberResponse : WechatTenpayResponse + { + /// + /// 获取或设置微信二级商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + public string SubMerchantId { get; set; } = default!; + + /// + /// 获取或设置商户注销申请单号。 + /// + [Newtonsoft.Json.JsonProperty("out_apply_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_apply_no")] + public string OutApplyNumber { get; set; } = default!; + + /// + /// 获取或设置注销状态。 + /// + [Newtonsoft.Json.JsonProperty("cancel_state")] + [System.Text.Json.Serialization.JsonPropertyName("cancel_state")] + public string CancelState { get; set; } = default!; + + /// + /// 获取或设置驳回原因。 + /// + [Newtonsoft.Json.JsonProperty("reject_reason")] + [System.Text.Json.Serialization.JsonPropertyName("reject_reason")] + public string? RejectReason { get; set; } + + /// + /// 获取或设置更新时间。 + /// + [Newtonsoft.Json.JsonProperty("update_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("update_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + public DateTimeOffset? UpdateTime { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.cs new file mode 100644 index 00000000..9a2f3691 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.cs @@ -0,0 +1,38 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /ecommerce/account/cancel-applications/media 接口的请求。 + /// + public class UploadEcommerceAccountCancelApplicationMediaRequest : WechatTenpayRequest + { + /// + /// 获取或设置图片文件字节数组。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public byte[] FileBytes { get; set; } = Array.Empty(); + + /// + /// 获取或设置图片文件名（必须以 jpg、bmp、png 为后缀）。如果不指定将由系统自动生成。 + /// + [Newtonsoft.Json.JsonProperty("file_name")] + [System.Text.Json.Serialization.JsonPropertyName("file_name")] + public string? FileName { get; set; } + + /// + /// 获取或设置图片文件摘要。如果不指定将由系统自动生成。 + /// + [Newtonsoft.Json.JsonProperty("file_digest")] + [System.Text.Json.Serialization.JsonPropertyName("file_digest")] + public string? FileHash { get; set; } + + /// + /// 获取或设置图片文件 Conent-Type。如果不指定将由系统自动生成。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string? FileContentType { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.cs new file mode 100644 index 00000000..1cef9788 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /ecommerce/account/cancel-applications/media 接口的响应。 + /// + public class UploadEcommerceAccountCancelApplicationMediaResponse : WechatTenpayResponse + { + /// + /// 获取或设置媒体文件标识 ID。 + /// + [Newtonsoft.Json.JsonProperty("media_id")] + [System.Text.Json.Serialization.JsonPropertyName("media_id")] + public string MediaId { get; set; } = default!; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj index c44dc26b..d10987ea 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/SKIT.FlurlHttpClient.Wechat.TenpayV3.csproj @@ -14,7 +14,7 @@ MIT https://github.com/fudiwei/DotNetCore.SKIT.FlurlHttpClient.Wechat Flurl.Http Wechat Weixin MicroMessage Tenpay WechatPay WeixinPay Wxpay 微信 微信支付 微信商户 - 2.18.0 + 2.19.0 基于 Flurl.Http 的微信支付 API v3 版客户端，支持直连商户、服务商模式，支持基础支付、代金券、商家券、委托营销、消费卡、支付有礼、银行定向促活、微信支付分、微信先享卡、支付即服务、点金计划、智慧商圈、电商收付通、二级商户进件、小微商户进件、消费者投诉、商户违规通知、批量转账到零钱、银行组件、海关报关、融合钱包、微工卡、电子发票、车主平台、教育续费通、校园轻松付等功能。 Fu Diwei git diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.json new file mode 100644 index 00000000..e65482fb --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationRequest.json @@ -0,0 +1,10 @@ +{ + "sub_mchid": "1900000109", + "out_apply_no": "2019061122222222122", + "application_info": [ + { + "application_type": "SP_MERCHANT_APPLICATION", + "application_media_id": "abc123456" + } + ] +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.json new file mode 100644 index 00000000..1e654ab5 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/CreateEcommerceAccountCancelApplicationResponse.json @@ -0,0 +1,7 @@ +{ + "out_apply_no": "abcd12345FEGH", + "sub_mchid": "123456789", + "reject_reason": "非电商服务商，无权调用此接口", + "cancel_state": "REVIEWING", + "update_time": "2023-01-20T13:29:35+08:00" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.json new file mode 100644 index 00000000..1e654ab5 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/GetEcommerceAccountCancelApplicationByOutApplyNumberResponse.json @@ -0,0 +1,7 @@ +{ + "out_apply_no": "abcd12345FEGH", + "sub_mchid": "123456789", + "reject_reason": "非电商服务商，无权调用此接口", + "cancel_state": "REVIEWING", + "update_time": "2023-01-20T13:29:35+08:00" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.json new file mode 100644 index 00000000..e407540a --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaRequest.json @@ -0,0 +1,4 @@ +{ + "file_name": "", + "file_digest": "" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.json new file mode 100644 index 00000000..9cddc8d1 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_Partner/Ecommerce/Account/UploadEcommerceAccountCancelApplicationMediaResponse.json @@ -0,0 +1,3 @@ +{ + "media_id": "H1ihR9JUtVj-J7CJqBUY5ZOrG_Je75H-rKhTG7FUmg9sxNTbRN54dFiUHnhgrBQ6EKeHoGcHTJMHn5TAuLVjHUQDBInSWXcIHYXOeRa2OHA" +}