From 772ee51b6f30ce956f9a0e06e8985a734f5472f4 Mon Sep 17 00:00:00 2001 From: MoondanceZ Date: Wed, 15 Nov 2023 11:28:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wxapi):=20=E4=BF=AE=E6=94=B9=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=8F=B7=E5=B0=8F=E5=BA=97=E8=BF=90=E8=B4=B9=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E6=98=AF=E5=90=A6=E9=BB=98=E8=AE=A4=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=8C=96=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChannelsECMerchantAddFreightTemplateRequest.cs | 4 ---- .../ChannelsECMerchantGetFreightTemplateDetailResponse.cs | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantAddFreightTemplateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantAddFreightTemplateRequest.cs index 9234ae5d..a8fbd531 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantAddFreightTemplateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantAddFreightTemplateRequest.cs @@ -155,9 +155,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models /// 获取或设置是否为默认运费。 /// [Newtonsoft.Json.JsonProperty("is_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] public bool IsDefault { get; set; } /// @@ -267,9 +265,7 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models /// 获取或设置是否为默认模版。 /// [Newtonsoft.Json.JsonProperty("is_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalNullableBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalNullableBooleanConverter))] public bool? IsDefault { get; set; } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantGetFreightTemplateDetailResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantGetFreightTemplateDetailResponse.cs index 7b79adfa..2a5c47e6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantGetFreightTemplateDetailResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECMerchant/FreightTemplate/ChannelsECMerchantGetFreightTemplateDetailResponse.cs @@ -152,9 +152,7 @@ /// 获取或设置是否为默认运费。 /// [Newtonsoft.Json.JsonProperty("is_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] public bool IsDefault { get; set; } /// @@ -272,9 +270,7 @@ /// 获取或设置是否为默认模版。 /// [Newtonsoft.Json.JsonProperty("is_default")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.NumericalBooleanConverter))] [System.Text.Json.Serialization.JsonPropertyName("is_default")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.NumericalBooleanConverter))] public bool IsDefault { get; set; } /// -- Gitee From 0eeea1ca1b6a02dae162687be2aafa6400f1cc76 Mon Sep 17 00:00:00 2001 From: MoondanceZ Date: Wed, 15 Nov 2023 18:53:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(wxapi):=20=E6=96=B0=E5=A2=9E=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=8F=B7=E5=B0=8F=E5=BA=97=E8=8E=B7=E5=8F=96=E7=94=9F?= =?UTF-8?q?=E6=95=88=E4=B8=AD=E7=9A=84=E5=93=81=E7=89=8C=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...echatApiClientExecuteChannelsExtensions.cs | 20 +++++++++++ .../ChannelsECBrandValidListGetRequest.cs | 23 ++++++++++++ .../ChannelsECBrandValidListGetResponse.cs | 36 +++++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetResponse.cs diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteChannelsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteChannelsExtensions.cs index 0cb9a9be..4b2adff4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteChannelsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteChannelsExtensions.cs @@ -417,6 +417,26 @@ namespace SKIT.FlurlHttpClient.Wechat.Api return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } + + /// + /// 异步调用 [POST] /channels/ec/brand/valid/list/get 接口。 + /// REF: https://developers.weixin.qq.com/doc/channels/API/brand/valid_list_get.html + /// + /// + /// + /// + /// + public static async Task ExecuteChannelsECBrandValidListGetAsync(this WechatApiClient client, Models.ChannelsECBrandValidListGetRequest 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, "channels", "ec", "brand", "valid", "list", "get") + .SetQueryParam("access_token", request.AccessToken); + + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); + } #endregion #region ECMerchant diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetRequest.cs new file mode 100644 index 00000000..99e4ee7a --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetRequest.cs @@ -0,0 +1,23 @@ +namespace SKIT.FlurlHttpClient.Wechat.Api.Models +{ + /// + /// 表示 [POST] /channels/ec/brand/valid/list/get 接口的请求。 + /// + public class ChannelsECBrandValidListGetRequest : WechatApiRequest, IInferable + { + /// + /// 获取或设置分页每页页数。 + /// 默认值：10 + /// + [Newtonsoft.Json.JsonProperty("page_size")] + [System.Text.Json.Serialization.JsonPropertyName("page_size")] + public int Limit { get; set; } = 10; + + /// + /// 获取或设置翻页标记。 + /// + [Newtonsoft.Json.JsonProperty("next_key")] + [System.Text.Json.Serialization.JsonPropertyName("next_key")] + public string? Cursor { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetResponse.cs new file mode 100644 index 00000000..6cefbc5a --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECBrand/ChannelsECBrandValidListGetResponse.cs @@ -0,0 +1,36 @@ +namespace SKIT.FlurlHttpClient.Wechat.Api.Models +{ + /// + /// 表示 [POST] /channels/ec/brand/valid/list/get 接口的响应。 + /// + public class ChannelsECBrandValidListGetResponse : WechatApiResponse + { + public static class Types + { + public class Brand : ChannelsECBrandValidListGetResponse.Types.Brand + { + } + } + + /// + /// 获取或设置品牌列表。 + /// + [Newtonsoft.Json.JsonProperty("brands")] + [System.Text.Json.Serialization.JsonPropertyName("brands")] + public Types.Brand[] BrandList { get; set; } = default!; + + /// + /// 获取或设置品牌总数量。 + /// + [Newtonsoft.Json.JsonProperty("total_num")] + [System.Text.Json.Serialization.JsonPropertyName("total_num")] + public int TotalCount { get; set; } + + /// + /// 获取或设置翻页标记。 + /// + [Newtonsoft.Json.JsonProperty("next_key")] + [System.Text.Json.Serialization.JsonPropertyName("next_key")] + public string? NextCursor { get; set; } + } +} -- Gitee