diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs index 7510647d..cca4936d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdCreativesExtensions.cs @@ -61,19 +61,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "adcreatives", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.AdCreativeId is not null) - flurlReq.SetQueryParam("adcreative_id", request.AdCreativeId.Value); - - if (request.Filters is not null) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("adcreative_id", request.AdCreativeId) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs index a24f0d7f..4b786524 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdGroupsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -61,19 +61,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "adgroups", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.AdGroupId is not null) - flurlReq.SetQueryParam("adgroup_id", request.AdGroupId.Value); - - if (request.Filters is not null) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("adgroup_id", request.AdGroupId) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs index f2531d44..b96a816a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAdsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -61,19 +61,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "ads", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.AdId is not null) - flurlReq.SetQueryParam("ad_id", request.AdId.Value); - - if (request.Filters is not null) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("ad_id", request.AdId) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs index 1c068a10..e520bd64 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteAsyncTasksExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net.Http; using System.Threading; @@ -43,16 +43,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "async_tasks", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Filters is not null && request.Filters.Any()) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs index 84a38462..3c54bae8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCampaignsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -61,19 +61,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "campaigns", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.CampaignId is not null) - flurlReq.SetQueryParam("campaign_id", request.CampaignId.Value); - - if (request.Filters is not null) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("campaign_id", request.CampaignId) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs index 116fda16..1aebd8a7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCreditBillsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -25,13 +25,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateFlurlRequest(request, HttpMethod.Get, "credit_bills", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("bill_year", request.BillYear) - .SetQueryParam("bill_month", request.BillMonth); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("bill_month", request.BillMonth) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs index 8b436b7b..41104426 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteCustomAudiencesExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Net.Http.Headers; using System.Threading; @@ -62,16 +62,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "custom_audiences", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.CustomAudienceId is not null) - flurlReq.SetQueryParam("audience_id", request.CustomAudienceId.Value); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("audience_id", request.CustomAudienceId) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -121,19 +115,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "custom_audience_files", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.CustomAudienceId is not null) - flurlReq.SetQueryParam("audience_id", request.CustomAudienceId.Value); - - if (request.CustomAudienceFileId is not null) - flurlReq.SetQueryParam("custom_audience_file_id", request.CustomAudienceFileId.Value); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("audience_id", request.CustomAudienceId) + .SetQueryParam("custom_audience_file_id", request.CustomAudienceFileId) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs index 7ed2aa16..12af5b8c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteFundsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net.Http; using System.Threading; using System.Threading.Tasks; @@ -61,19 +61,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "fund_statements_detailed", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.DateRange is not null) - flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange)); - - if (request.TradeType is not null) - flurlReq.SetQueryParam("trade_type", request.TradeType); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("date_range", request.DateRange is null ? null : client.JsonSerializer.Serialize(request.DateRange)) + .SetQueryParam("trade_type", request.TradeType) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs index bb2e0e42..bb559d15 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteImagesExtensions.cs @@ -63,19 +63,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "images", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.ImageId is not null) - flurlReq.SetQueryParam("image_id", request.ImageId); - - if (request.Filters is not null) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("image_id", request.ImageId) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs index 20b9e35a..a6ba9446 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Ads/Extensions/WechatAdsClientExecuteReportsExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net.Http; using System.Threading; @@ -24,22 +24,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "daily_reports", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.DateRange is not null) - flurlReq.SetQueryParam("date_range", client.JsonSerializer.Serialize(request.DateRange)); - - if (request.ReportType is not null) - flurlReq.SetQueryParam("report_type", request.ReportType); - - if (request.ReportLevel is not null) - flurlReq.SetQueryParam("level", request.ReportLevel); - - if (request.PageSize is not null) - flurlReq.SetQueryParam("page_size", request.PageSize.Value); - - if (request.Page is not null) - flurlReq.SetQueryParam("page", request.Page.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("date_range", request.DateRange is null ? null : client.JsonSerializer.Serialize(request.DateRange)) + .SetQueryParam("report_type", request.ReportType) + .SetQueryParam("level", request.ReportLevel) + .SetQueryParam("page_size", request.PageSize) + .SetQueryParam("page", request.Page); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -60,10 +50,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Ads .CreateFlurlRequest(request, HttpMethod.Get, "realtime_cost", "get") .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("date", request.DateString) - .SetQueryParam("level", request.Level); - - if (request.Filters is not null && request.Filters.Any()) - flurlReq.SetQueryParam("filtering", client.JsonSerializer.Serialize(request.Filters)); + .SetQueryParam("level", request.Level) + .SetQueryParam("filtering", request.Filters is null ? null : client.JsonSerializer.Serialize(request.Filters)); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs index 534ccb01..c804ede6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCVExtensions.cs @@ -52,10 +52,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -80,10 +86,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -108,10 +120,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } #endregion @@ -139,10 +157,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("type", request.ImageMode); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -168,10 +192,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("type", request.ImageMode); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -197,10 +227,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("type", request.ImageMode); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -226,10 +262,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("type", request.ImageMode); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -255,10 +297,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("type", request.ImageMode); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -283,10 +331,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } /// @@ -310,10 +364,16 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken); if (request.ImageUrl is not null) + { flurlReq.SetQueryParam("img_url", request.ImageUrl); - using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); - return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + else + { + using var httpContent = CreateRequestHttpContent(request.ImageFileBytes ?? Array.Empty()); + return await client.SendFlurlRequestAsync(flurlReq, httpContent: httpContent, cancellationToken: cancellationToken).ConfigureAwait(false); + } } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs index f2b76d18..71a0d73a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinGuideExtensions.cs @@ -51,12 +51,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "guide", "getguideacct") - .SetQueryParam("access_token", request.AccessToken); - - if (request.GuideAccount is not null) - flurlReq.SetQueryParam("guide_account", request.GuideAccount); - else if (request.GuideOpenId is not null) - flurlReq.SetQueryParam("guide_openid", request.GuideOpenId); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("guide_account", request.GuideAccount) + .SetQueryParam("guide_openid", request.GuideOpenId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs index f9f16f0d..cf6ddc85 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteCgibinUserExtensions.cs @@ -98,10 +98,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "get") - .SetQueryParam("access_token", request.AccessToken); - - if (request.NextOpenId is not null) - flurlReq.SetQueryParam("next_openid", request.NextOpenId); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("next_openid", request.NextOpenId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs index e065e5c8..b4cffba0 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecutePublisherStatExtensions.cs @@ -28,13 +28,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_adpos_general") - .SetQueryParam("page", request.Page) - .SetQueryParam("page_size", request.Limit) + .SetQueryParam("ad_slot", request.AdSlotName) .SetQueryParam("start_date", request.StartDateString) - .SetQueryParam("end_date", request.EndDateString); - - if (request.AdSlotName is not null) - flurlReq.SetQueryParam("ad_slot", request.AdSlotName); + .SetQueryParam("end_date", request.EndDateString) + .SetQueryParam("page", request.Page) + .SetQueryParam("page_size", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -58,10 +56,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_cps_general") - .SetQueryParam("page", request.Page) - .SetQueryParam("page_size", request.Limit) .SetQueryParam("start_date", request.StartDateString) - .SetQueryParam("end_date", request.EndDateString); + .SetQueryParam("end_date", request.EndDateString) + .SetQueryParam("page", request.Page) + .SetQueryParam("page_size", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -85,10 +83,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "publisher", "stat") .SetQueryParam("action", "publisher_settlement") - .SetQueryParam("page", request.Page) - .SetQueryParam("page_size", request.Limit) .SetQueryParam("start_date", request.StartDateString) - .SetQueryParam("end_date", request.EndDateString); + .SetQueryParam("end_date", request.EndDateString) + .SetQueryParam("page", request.Page) + .SetQueryParam("page_size", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs index c69e8631..4ab26464 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionPromoterExtensions.cs @@ -150,48 +150,22 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "promoter", "product", "list") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("queryType", request.QueryType) + .SetQueryParam("query", request.Query) + .SetQueryParam("maxPrice", request.MaxPrice) + .SetQueryParam("minPrice", request.MinPrice) + .SetQueryParam("minCommissionValue", request.MinCommissionValue) + .SetQueryParam("minCommissionRatio", request.MinCommissionRatio) + .SetQueryParam("sortType", request.SortType) + .SetQueryParam("hasCoupon", request.HasCoupon.HasValue ? request.HasCoupon.Value ? 1 : 0 : null) + .SetQueryParam("shopAppIds", request.ShopAppIdList is null ? null : string.Join(",", request.ShopAppIdList)) + .SetQueryParam("categoryId", request.CategoryId) + .SetQueryParam("category", request.CategoryIdList is null ? null : string.Join(",", request.CategoryIdList)) + .SetQueryParam("noCategory", request.CategoryIdBlackList is null ? null : string.Join(",", request.CategoryIdBlackList)) + .SetQueryParam("productId", request.ProductIdList is null ? null : string.Join(",", request.ProductIdList)) .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.QueryType is not null) - flurlReq.SetQueryParam("queryType", request.QueryType.Value); - - if (request.Query is not null) - flurlReq.SetQueryParam("query", request.Query); - - if (request.MaxPrice is not null) - flurlReq.SetQueryParam("maxPrice", request.MaxPrice.Value); - - if (request.MinPrice is not null) - flurlReq.SetQueryParam("minPrice", request.MinPrice.Value); - - if (request.MinCommissionValue is not null) - flurlReq.SetQueryParam("minCommissionValue", request.MinCommissionValue.Value); - - if (request.MinCommissionRatio is not null) - flurlReq.SetQueryParam("minCommissionRatio", request.MinCommissionRatio.Value); - - if (request.SortType is not null) - flurlReq.SetQueryParam("sortType", request.SortType.Value); - - if (request.HasCoupon is not null) - flurlReq.SetQueryParam("hasCoupon", request.HasCoupon.Value ? 1 : 0); - - if (request.ShopAppIdList is not null) - flurlReq.SetQueryParam("shopAppIds", string.Join(",", request.ShopAppIdList)); - - if (request.CategoryId is not null) - flurlReq.SetQueryParam("categoryId", request.CategoryId); - - if (request.CategoryIdList is not null) - flurlReq.SetQueryParam("category", string.Join(",", request.CategoryIdList)); - - if (request.CategoryIdBlackList is not null) - flurlReq.SetQueryParam("noCategory", string.Join(",", request.CategoryIdBlackList)); - - if (request.ProductIdList is not null) - flurlReq.SetQueryParam("productId", string.Join(",", request.ProductIdList)); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -214,48 +188,22 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "promoter", "product", "select") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("maxPrice", request.MaxPrice) + .SetQueryParam("minPrice", request.MinPrice) + .SetQueryParam("minCommissionValue", request.MinCommissionValue) + .SetQueryParam("minCommissionRatio", request.MinCommissionRatio) + .SetQueryParam("sortType", request.SortType) + .SetQueryParam("hasCoupon", request.HasCoupon.HasValue ? request.HasCoupon.Value ? 1 : 0 : null) + .SetQueryParam("shopAppIds", request.ShopAppIdList is null ? null : string.Join(",", request.ShopAppIdList)) + .SetQueryParam("categoryId", request.CategoryId) + .SetQueryParam("category", request.CategoryIdList is null ? null : string.Join(",", request.CategoryIdList)) + .SetQueryParam("noCategory", request.CategoryIdBlackList is null ? null : string.Join(",", request.CategoryIdBlackList)) + .SetQueryParam("productId", request.ProductIdList is null ? null : string.Join(",", request.ProductIdList)) + .SetQueryParam("shippingMethods", client.JsonSerializer.Serialize(request.ShippingMethods)) + .SetQueryParam("addressList", client.JsonSerializer.Serialize(request.AddressList)) .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.MaxPrice is not null) - flurlReq.SetQueryParam("maxPrice", request.MaxPrice.Value); - - if (request.MinPrice is not null) - flurlReq.SetQueryParam("minPrice", request.MinPrice.Value); - - if (request.MinCommissionValue is not null) - flurlReq.SetQueryParam("minCommissionValue", request.MinCommissionValue.Value); - - if (request.MinCommissionRatio is not null) - flurlReq.SetQueryParam("minCommissionRatio", request.MinCommissionRatio.Value); - - if (request.SortType is not null) - flurlReq.SetQueryParam("sortType", request.SortType.Value); - - if (request.HasCoupon is not null) - flurlReq.SetQueryParam("hasCoupon", request.HasCoupon.Value ? 1 : 0); - - if (request.ShopAppIdList is not null) - flurlReq.SetQueryParam("shopAppIds", string.Join(",", request.ShopAppIdList)); - - if (request.CategoryId is not null) - flurlReq.SetQueryParam("categoryId", request.CategoryId); - - if (request.CategoryIdList is not null) - flurlReq.SetQueryParam("category", string.Join(",", request.CategoryIdList)); - - if (request.CategoryIdBlackList is not null) - flurlReq.SetQueryParam("noCategory", string.Join(",", request.CategoryIdBlackList)); - - if (request.ProductIdList is not null) - flurlReq.SetQueryParam("productId", string.Join(",", request.ProductIdList)); - - if (request.ShippingMethods is not null) - flurlReq.SetQueryParam("shippingMethods", client.JsonSerializer.Serialize(request.ShippingMethods)); - - if (request.AddressList is not null) - flurlReq.SetQueryParam("addressList", client.JsonSerializer.Serialize(request.AddressList)); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -445,45 +393,21 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "promoter", "open_product", "list") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("queryType", request.QueryType) + .SetQueryParam("query", request.Query) + .SetQueryParam("maxPrice", request.MaxPrice) + .SetQueryParam("minPrice", request.MinPrice) + .SetQueryParam("minCommissionValue", request.MinCommissionValue) + .SetQueryParam("minCommissionRatio", request.MinCommissionRatio) + .SetQueryParam("sortType", request.SortType) + .SetQueryParam("shopAppIds", request.ShopAppIdList is null ? null : string.Join(",", request.ShopAppIdList)) + .SetQueryParam("categoryId", request.CategoryId) + .SetQueryParam("category", request.CategoryIdList is null ? null : string.Join(",", request.CategoryIdList)) + .SetQueryParam("noCategory", request.CategoryIdBlackList is null ? null : string.Join(",", request.CategoryIdBlackList)) + .SetQueryParam("productId", request.ProductIdList is null ? null : string.Join(",", request.ProductIdList)) .SetQueryParam("from", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.QueryType is not null) - flurlReq.SetQueryParam("queryType", request.QueryType.Value); - - if (request.Query is not null) - flurlReq.SetQueryParam("query", request.Query); - - if (request.MaxPrice is not null) - flurlReq.SetQueryParam("maxPrice", request.MaxPrice.Value); - - if (request.MinPrice is not null) - flurlReq.SetQueryParam("minPrice", request.MinPrice.Value); - - if (request.MinCommissionValue is not null) - flurlReq.SetQueryParam("minCommissionValue", request.MinCommissionValue.Value); - - if (request.MinCommissionRatio is not null) - flurlReq.SetQueryParam("minCommissionRatio", request.MinCommissionRatio.Value); - - if (request.SortType is not null) - flurlReq.SetQueryParam("sortType", request.SortType.Value); - - if (request.ShopAppIdList is not null) - flurlReq.SetQueryParam("shopAppIds", string.Join(",", request.ShopAppIdList)); - - if (request.CategoryId is not null) - flurlReq.SetQueryParam("categoryId", request.CategoryId); - - if (request.CategoryIdList is not null) - flurlReq.SetQueryParam("category", string.Join(",", request.CategoryIdList)); - - if (request.CategoryIdBlackList is not null) - flurlReq.SetQueryParam("noCategory", string.Join(",", request.CategoryIdBlackList)); - - if (request.ProductIdList is not null) - flurlReq.SetQueryParam("productId", string.Join(",", request.ProductIdList)); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -554,17 +478,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "promoter", "order", "search") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("startTimestamp", request.StartTimestamp) + .SetQueryParam("endTimestamp", request.EndTimestamp) + .SetQueryParam("commissionStatus", request.CommissionStatus) .SetQueryParam("page", request.Page); - if (request.StartTimestamp is not null) - flurlReq.SetQueryParam("startTimestamp", request.StartTimestamp.Value); - - if (request.EndTimestamp is not null) - flurlReq.SetQueryParam("endTimestamp", request.EndTimestamp.Value); - - if (request.CommissionStatus is not null) - flurlReq.SetQueryParam("commissionStatus", request.CommissionStatus); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -587,48 +505,22 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "promoter", "order", "search_normal_order") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("query", request.Query) + .SetQueryParam("orderId", request.OrderId) + .SetQueryParam("outOrderId", request.OutOrderId) + .SetQueryParam("outOrderIdList", request.OutOrderId is null ? null : string.Join(",", request.OutOrderId)) + .SetQueryParam("tradeNo", request.TransactionId) + .SetQueryParam("transactionIdList", request.TransactionIdList is null ? null :string.Join(",", request.TransactionIdList)) + .SetQueryParam("startPayTime", request.StartPayTimestamp) + .SetQueryParam("endPayTime", request.EndPayTimestamp) + .SetQueryParam("commissionStatus", request.CommissionStatus) + .SetQueryParam("startStatusUpdateTime", request.StartStatusUpdateTimestamp) + .SetQueryParam("endStatusUpdateTime", request.EndStatusUpdateTimestamp) + .SetQueryParam("sortBy", request.SortBy) + .SetQueryParam("sortOrder", request.SortOrder) .SetQueryParam("offset", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.Query is not null) - flurlReq.SetQueryParam("query", request.Query); - - if (request.OrderId is not null) - flurlReq.SetQueryParam("orderId", request.OrderId.Value); - - if (request.OutOrderId is not null) - flurlReq.SetQueryParam("outOrderId", request.OutOrderId); - - if (request.OutOrderIdList is not null) - flurlReq.SetQueryParam("outOrderIdList", string.Join(",", request.OutOrderId)); - - if (request.TransactionId is not null) - flurlReq.SetQueryParam("tradeNo", request.TransactionId); - - if (request.TransactionIdList is not null) - flurlReq.SetQueryParam("transactionIdList", string.Join(",", request.TransactionIdList)); - - if (request.StartPayTimestamp is not null) - flurlReq.SetQueryParam("startPayTime", request.StartPayTimestamp.Value); - - if (request.EndPayTimestamp is not null) - flurlReq.SetQueryParam("endPayTime", request.EndPayTimestamp.Value); - - if (request.CommissionStatus is not null) - flurlReq.SetQueryParam("commissionStatus", request.CommissionStatus); - - if (request.StartStatusUpdateTimestamp is not null) - flurlReq.SetQueryParam("startStatusUpdateTime", request.StartStatusUpdateTimestamp.Value); - - if (request.EndStatusUpdateTimestamp is not null) - flurlReq.SetQueryParam("endStatusUpdateTime", request.EndStatusUpdateTimestamp.Value); - - if (request.SortBy is not null) - flurlReq.SetQueryParam("sortBy", request.SortBy); - - if (request.SortOrder is not null) - flurlReq.SetQueryParam("sortOrder", request.SortOrder); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionShopExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionShopExtensions.cs index 99dbff9c..45454bcc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionShopExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteUnionShopExtensions.cs @@ -100,51 +100,23 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "shop", "order", "search_normal_order") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("query", request.Query) + .SetQueryParam("allianceAppid", request.AllianceAppId) + .SetQueryParam("orderId", request.OrderId) + .SetQueryParam("outOrderId", request.OutOrderId) + .SetQueryParam("outOrderIdList", request.OutOrderId is null ? null : string.Join(",", request.OutOrderId)) + .SetQueryParam("tradeNo", request.TransactionId) + .SetQueryParam("transactionIdList", request.TransactionIdList is null ? null : string.Join(",", request.TransactionIdList)) + .SetQueryParam("startPayTime", request.StartPayTimestamp) + .SetQueryParam("endPayTime", request.EndPayTimestamp) + .SetQueryParam("commissionStatus", request.CommissionStatus) + .SetQueryParam("startStatusUpdateTime", request.StartStatusUpdateTimestamp) + .SetQueryParam("endStatusUpdateTime", request.EndStatusUpdateTimestamp) + .SetQueryParam("sortBy", request.SortBy) + .SetQueryParam("sortOrder", request.SortOrder) .SetQueryParam("offset", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.Query is not null) - flurlReq.SetQueryParam("query", request.Query); - - if (request.AllianceAppId is not null) - flurlReq.SetQueryParam("allianceAppid", request.AllianceAppId); - - if (request.OrderId is not null) - flurlReq.SetQueryParam("orderId", request.OrderId.Value); - - if (request.OutOrderId is not null) - flurlReq.SetQueryParam("outOrderId", request.OutOrderId); - - if (request.OutOrderIdList is not null) - flurlReq.SetQueryParam("outOrderIdList", string.Join(",", request.OutOrderId)); - - if (request.TransactionId is not null) - flurlReq.SetQueryParam("tradeNo", request.TransactionId); - - if (request.TransactionIdList is not null) - flurlReq.SetQueryParam("transactionIdList", string.Join(",", request.TransactionIdList)); - - if (request.StartPayTimestamp is not null) - flurlReq.SetQueryParam("startPayTime", request.StartPayTimestamp.Value); - - if (request.EndPayTimestamp is not null) - flurlReq.SetQueryParam("endPayTime", request.EndPayTimestamp.Value); - - if (request.CommissionStatus is not null) - flurlReq.SetQueryParam("commissionStatus", request.CommissionStatus); - - if (request.StartStatusUpdateTimestamp is not null) - flurlReq.SetQueryParam("startStatusUpdateTime", request.StartStatusUpdateTimestamp.Value); - - if (request.EndStatusUpdateTimestamp is not null) - flurlReq.SetQueryParam("endStatusUpdateTime", request.EndStatusUpdateTimestamp.Value); - - if (request.SortBy is not null) - flurlReq.SetQueryParam("sortBy", request.SortBy); - - if (request.SortOrder is not null) - flurlReq.SetQueryParam("sortOrder", request.SortOrder); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion @@ -191,19 +163,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "shop", "target", "plan_list") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); - - if (request.PlanStatus is not null) - flurlReq.SetQueryParam("planStatus", request.PlanStatus); - - if (request.PlanId is not null) - flurlReq.SetQueryParam("planId", request.PlanId); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("planId", request.PlanId) + .SetQueryParam("planStatus", request.PlanStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -227,13 +191,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "shop", "target", "product_list") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("planId", request.PlanId); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("planId", request.PlanId) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -257,13 +217,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "union", "shop", "target", "promoter_list") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("planId", request.PlanId); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("planId", request.PlanId) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs index ca7beb16..a81d3705 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaApiExtensions.cs @@ -179,12 +179,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxaapi", "feedback", "list") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("type", request.Type) .SetQueryParam("page", request.Page) .SetQueryParam("num", request.Limit); - if (request.Type is not null) - flurlReq.SetQueryParam("type", request.Type); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -324,28 +322,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api .SetQueryParam("access_token", request.AccessToken) .SetQueryParam("date", request.DateString) .SetQueryParam("begintime", request.BeginTimestamp) - .SetQueryParam("endtime", request.EndTimestamp); - - if (request.TraceId is not null) - flurlReq.SetQueryParam("traceId", request.TraceId); - - if (request.PagePath is not null) - flurlReq.SetQueryParam("url", request.PagePath); - - if (request.UserId is not null) - flurlReq.SetQueryParam("id", request.UserId); - - if (request.FilterMessage is not null) - flurlReq.SetQueryParam("filterMsg", request.FilterMessage); - - if (request.LogLevel is not null) - flurlReq.SetQueryParam("level", request.LogLevel.Value); - - if (request.Offset is not null) - flurlReq.SetQueryParam("start", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("endtime", request.EndTimestamp) + .SetQueryParam("traceId", request) + .SetQueryParam("url", request) + .SetQueryParam("id", request) + .SetQueryParam("filterMsg", request) + .SetQueryParam("level", request.LogLevel) + .SetQueryParam("start", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -464,10 +448,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "room", "getsharedcode") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("roomId", request.RoomId); - - if (request.CustomParameter is not null) - flurlReq.SetQueryParam("params", request.CustomParameter); + .SetQueryParam("roomId", request.RoomId) + .SetQueryParam("params", request.CustomParameter); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -1125,19 +1107,11 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxaapi", "broadcast", "role", "getrolelist") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Keyword is not null) - flurlReq.SetQueryParam("keyword", request.Keyword); - - if (request.Role is not null) - flurlReq.SetQueryParam("role", request.Role.Value); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("keyword", request.Keyword) + .SetQueryParam("role", request.Role) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -1258,13 +1232,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxaapi", "wxaembedded", "get_list") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Offset is not null) - flurlReq.SetQueryParam("start", request.Offset); - - if (request.Limit is not null) - flurlReq.SetQueryParam("num", request.Limit); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("start", request.Offset) + .SetQueryParam("num", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -1287,13 +1257,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxaapi", "wxaembedded", "get_own_list") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Offset is not null) - flurlReq.SetQueryParam("start", request.Offset); - - if (request.Limit is not null) - flurlReq.SetQueryParam("num", request.Limit); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("start", request.Offset) + .SetQueryParam("num", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs index bb2c2196..f047f4cf 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaComponentExtensions.cs @@ -769,10 +769,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxa", "get_qrcode") - .SetQueryParam("access_token", request.AccessToken); - - if (request.PagePath is not null) - flurlReq.SetQueryParam("path", request.PagePath); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("path", request.PagePath); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -910,13 +908,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxa", "revertcoderelease") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Action is not null) - flurlReq.SetQueryParam("action", request.Action); - - if (request.AppVersion is not null) - flurlReq.SetQueryParam("app_version", request.AppVersion.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("action", request.Action) + .SetQueryParam("app_version", request.AppVersion); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -2210,10 +2204,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxa", "gettemplatelist") - .SetQueryParam("access_token", request.ComponentAccessToken); - - if (request.TemplateType is not null) - flurlReq.SetQueryParam("template_type", request.TemplateType.Value); + .SetQueryParam("access_token", request.ComponentAccessToken) + .SetQueryParam("template_type", request.TemplateType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs index 711641a4..2f0dce53 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Extensions/WechatApiClientExecuteWxaExtensions.cs @@ -82,13 +82,10 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxa", "getpaidunionid") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("openid", request.OpenId); - - if (request.TransactionId is not null) - flurlReq.SetQueryParam("transaction_id", request.TransactionId); - else if (request.OutTradeNumber is not null) - flurlReq.SetQueryParam("mch_id", request.MerchantId) - .SetQueryParam("out_trade_no", request.OutTradeNumber); + .SetQueryParam("openid", request.OpenId) + .SetQueryParam("mch_id", request.MerchantId) + .SetQueryParam("out_trade_no", request.OutTradeNumber) + .SetQueryParam("transaction_id", request.TransactionId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -432,10 +429,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Api IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "wxa", "getwxadevinfo") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Action is not null) - flurlReq.SetQueryParam("action", request.Action); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("action", request.Action); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteProfitAllocationsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteProfitAllocationsExtensions.cs index 54303906..e6f0b843 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteProfitAllocationsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientExecuteProfitAllocationsExtensions.cs @@ -146,11 +146,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "mse-pay", "profit-allocations", "receiver-accounts") - .SetQueryParam("ent_id", request.EnterpriseId); - - if (request.UnifiedSocialCreditCode is not null) - flurlReq.SetQueryParam("unified_social_credit_code", request.UnifiedSocialCreditCode); - + .SetQueryParam("ent_id", request.EnterpriseId) + .SetQueryParam("unified_social_credit_code", request.UnifiedSocialCreditCode); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs index 4fc8841a..6bf5a7d4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs @@ -58,13 +58,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global .SetQueryParam("appid", request.AppId) .SetQueryParam("order_type", request.OrderType) .SetQueryParam("order_no", request.OrderNumber) - .SetQueryParam("customs", request.Customs); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit); + .SetQueryParam("customs", request.Customs) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs index 37ae24b4..62692088 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs @@ -277,11 +277,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "statements") + .SetQueryParam("mchid", request.SubMerchantId) .SetQueryParam("date", request.DateString); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -308,19 +306,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "settle", "settlements") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("settle_state", request.SettleState) + .SetQueryParam("settle_start_date", request.StartDateString) + .SetQueryParam("settle_end_date", request.EndDateString) .SetQueryParam("offset", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.StartDateString is not null) - flurlReq.SetQueryParam("settle_start_date", request.StartDateString); - - if (request.EndDateString is not null) - flurlReq.SetQueryParam("settle_end_date", request.EndDateString); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBankTransferExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBankTransferExtensions.cs index 2e697126..9294a56f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBankTransferExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBankTransferExtensions.cs @@ -50,16 +50,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "bank-transfer", "batches", "out-batch-no", request.OutBatchNumber) - .SetQueryParam("need_query_detail", request.RequireQueryDetail); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_status", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail) + .SetQueryParam("detail_status", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -82,16 +76,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "bank-transfer", "batches", "batch-id", request.BatchId) - .SetQueryParam("need_query_detail", request.RequireQueryDetail); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_state", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail) + .SetQueryParam("detail_state", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs index b9d41c92..6f51b9b5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs @@ -41,16 +41,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "bill", "tradebill") - .SetQueryParam("bill_date", request.BillDateString); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.BillType is not null) - flurlReq.SetQueryParam("bill_type", request.BillType); - - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("bill_date", request.BillDateString) + .SetQueryParam("bill_type", request.BillType) + .SetQueryParam("tar_type", request.TarType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -87,13 +81,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "bill", "fundflowbill") - .SetQueryParam("bill_date", request.BillDateString); - - if (request.AccountType is not null) - flurlReq.SetQueryParam("account_type", request.AccountType); - - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); + .SetQueryParam("bill_date", request.BillDateString) + .SetQueryParam("account_type", request.AccountType) + .SetQueryParam("tar_type", request.TarType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -124,14 +114,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateFlurlRequest(request, HttpMethod.Get, "bill", "sub-merchant-fundflowbill") .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("bill_date", request.BillDateString) + .SetQueryParam("account_type", request.AccountType) + .SetQueryParam("tar_type", request.TarType) .SetQueryParam("algorithm", request.Algorithm); - if (request.AccountType is not null) - flurlReq.SetQueryParam("account_type", request.AccountType); - - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs index 4785880f..197cd74a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs @@ -74,11 +74,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "businesscircle", "user-authorizations", request.OpenId) + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("appid", request.AppId); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -101,12 +99,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "businesscircle", "users", request.OpenId, "points", "commit_status") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("appid", request.AppId) .SetQueryParam("brandid", request.BrandId); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs index 6f49bdf9..33c22b33 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs @@ -26,10 +26,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "certificates"); - - if (request.AlgorithmType is not null) - flurlReq.SetQueryParam("algorithm_type", request.AlgorithmType); + .CreateFlurlRequest(request, HttpMethod.Get, "certificates") + .SetQueryParam("algorithm_type", request.AlgorithmType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs index 699e68a7..5d3fedc9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceExtensions.cs @@ -180,11 +180,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateFlurlRequest(request, HttpMethod.Get, "ecommerce", "bill", "fundflowbill") .SetQueryParam("bill_date", request.BillDateString) .SetQueryParam("account_type", request.AccountType) + .SetQueryParam("tar_type", request.TarType) .SetQueryParam("algorithm", request.Algorithm); - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion @@ -208,10 +206,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "ecommerce", "fund", "balance", request.SubMerchantId); - - if (request.AccountType is not null) - flurlReq.SetQueryParam("account_type", request.AccountType); + .CreateFlurlRequest(request, HttpMethod.Get, "ecommerce", "fund", "balance", request.SubMerchantId) + .SetQueryParam("account_type", request.AccountType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationPAPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationPAPayExtensions.cs index 93776c1b..c1f10c55 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationPAPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationPAPayExtensions.cs @@ -50,13 +50,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "edu-papay", "contracts", "id", request.ContractId) - .SetQueryParam("appid", request.AppId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.SubAppId is not null) - flurlReq.SetQueryParam("sub_appid", request.SubAppId); + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("appid", request.AppId) + .SetQueryParam("sub_appid", request.SubAppId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -80,26 +76,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "edu-papay", "user", request.OpenId, "contracts") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("appid", request.AppId) - .SetQueryParam("plan_id", request.PlanId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.SubAppId is not null) - flurlReq.SetQueryParam("sub_appid", request.SubAppId); - - if (request.SubOpenId is not null) - flurlReq.SetQueryParam("sub_openid", request.SubOpenId); - - if (request.ContractStatus is not null) - flurlReq.SetQueryParam("contract_status", request.ContractStatus); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); + .SetQueryParam("sub_appid", request.SubAppId) + .SetQueryParam("plan_id", request.PlanId) + .SetQueryParam("sub_openid", request.SubOpenId) + .SetQueryParam("contract_status", request.ContractStatus) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationSchoolPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationSchoolPayExtensions.cs index e5569cb1..9e220361 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationSchoolPayExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEducationSchoolPayExtensions.cs @@ -71,13 +71,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "eduschoolpay", "users", request.OpenId, "contracts") .SetQueryParam("plan_id", request.PlanId) - .SetQueryParam("contract_status", request.ContractStatus); ; - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); + .SetQueryParam("contract_status", request.ContractStatus) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -143,10 +139,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "eduschoolpay", "transactions", "out-trade-no", request.OutTradeNumber); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "eduschoolpay", "transactions", "out-trade-no", request.OutTradeNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -168,10 +162,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "eduschoolpay", "transactions", "id", request.TransactionId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "eduschoolpay", "transactions", "id", request.TransactionId) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs index 43c5e5bd..35c8c188 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs @@ -169,28 +169,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "busifavor", "users", request.OpenId, "coupons") - .SetQueryParam("appid", request.AppId); - - if (request.StockId is not null) - flurlReq.SetQueryParam("stock_id", request.StockId); - - if (request.CouponState is not null) - flurlReq.SetQueryParam("coupon_state", request.CouponState); - - if (request.CreatorMerchantId is not null) - flurlReq.SetQueryParam("creator_merchant", request.CreatorMerchantId); - - if (request.SenderMerchantId is not null) - flurlReq.SetQueryParam("sender_merchant", request.SenderMerchantId); - - if (request.BelongMerchantId is not null) - flurlReq.SetQueryParam("belong_merchant", request.BelongMerchantId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("appid", request.AppId) + .SetQueryParam("stock_id", request.StockId) + .SetQueryParam("coupon_state", request.CouponState) + .SetQueryParam("creator_merchant", request.CreatorMerchantId) + .SetQueryParam("sender_merchant", request.SenderMerchantId) + .SetQueryParam("belong_merchant", request.BelongMerchantId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -430,10 +416,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "busifavor", "subsidy", "pay-receipts") .SetQueryParam("stock_id", request.StockId) - .SetQueryParam("coupon_code", request.CouponCode); - - if (request.OutSubsidyNumber is not null) - flurlReq.SetQueryParam("out_subsidy_no", request.OutSubsidyNumber); + .SetQueryParam("coupon_code", request.CouponCode) + .SetQueryParam("out_subsidy_no", request.OutSubsidyNumber); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs index 9f884363..4d57ed1a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs @@ -163,18 +163,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "favor", "stocks") .SetQueryParam("stock_creator_mchid", request.StockCreatorMerchantId) + .SetQueryParam("create_start_time", request.CreateStartTime.HasValue ? request.CreateStartTime.Value.ToString("yyyy-MM-dd'T'HH:mm:sszzz") : null) + .SetQueryParam("create_end_time", request.CreateEndTime.HasValue ? request.CreateEndTime.Value.ToString("yyyy-MM-dd'T'HH:mm:sszzz") : null) + .SetQueryParam("status", request.Status) .SetQueryParam("limit", request.Limit.ToString()) .SetQueryParam("offset", request.Offset.ToString()); - if (request.CreateStartTime is not null) - flurlReq.SetQueryParam("create_start_time", request.CreateStartTime.Value.ToString("yyyy-MM-dd'T'HH:mm:sszzz")); - - if (request.CreateEndTime is not null) - flurlReq.SetQueryParam("create_end_time", request.CreateEndTime.Value.ToString("yyyy-MM-dd'T'HH:mm:sszzz")); - - if (request.Status is not null) - flurlReq.SetQueryParam("status", request.Status); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -351,28 +345,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "favor", "users", request.OpenId, "coupons") - .SetQueryParam("appid", request.AppId); - - if (request.StockId is not null) - flurlReq.SetQueryParam("stock_id", request.StockId); - - if (request.Status is not null) - flurlReq.SetQueryParam("status", request.Status); - - if (request.CreatorMerchantId is not null) - flurlReq.SetQueryParam("creator_mchid", request.CreatorMerchantId); - - if (request.SenderMerchantId is not null) - flurlReq.SetQueryParam("sender_mchid", request.SenderMerchantId); - - if (request.AvailableMerchantId is not null) - flurlReq.SetQueryParam("available_mchid", request.AvailableMerchantId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("appid", request.AppId) + .SetQueryParam("stock_id", request.StockId) + .SetQueryParam("status", request.Status) + .SetQueryParam("creator_mchid", request.CreatorMerchantId) + .SetQueryParam("sender_mchid", request.SenderMerchantId) + .SetQueryParam("available_mchid", request.AvailableMerchantId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardActivityExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardActivityExtensions.cs index 46cdef16..dcc2a484 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardActivityExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardActivityExtensions.cs @@ -69,22 +69,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "membercard-activity", "activities"); - - if (request.CardId is not null) - flurlReq.SetQueryParam("card_id", request.CardId); - - if (request.ActivityType is not null) - flurlReq.SetQueryParam("activity_type", request.ActivityType); - - if (request.ActivityStatus is not null) - flurlReq.SetQueryParam("activity_status", request.ActivityStatus); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "membercard-activity", "activities") + .SetQueryParam("card_id", request.CardId) + .SetQueryParam("activity_type", request.ActivityType) + .SetQueryParam("activity_status", request.ActivityStatus) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardOpenExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardOpenExtensions.cs index 7575e81a..e0badd21 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardOpenExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingMemberCardOpenExtensions.cs @@ -71,16 +71,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "membercard-open", "cards") - .SetQueryParam("appid", request.AppId); - - if (request.BrandId is not null) - flurlReq.SetQueryParam("brand_id", request.BrandId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("appid", request.AppId) + .SetQueryParam("brand_id", request.BrandId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -281,16 +275,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "membercard-open", "user", "cards") - .SetQueryParam("openid", request.OpenId); - - if (request.AppId is not null) - flurlReq.SetQueryParam("appid", request.AppId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("appid", request.AppId) + .SetQueryParam("openid", request.OpenId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs index 54a86980..6a59b45a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs @@ -75,19 +75,11 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "partnerships"); - - if (request.Partner is not null) - flurlReq.SetQueryParam("partner", client.JsonSerializer.Serialize(request.Partner)); - - if (request.AuthorizedData is not null) - flurlReq.SetQueryParam("authorized_data", client.JsonSerializer.Serialize(request.AuthorizedData)); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "partnerships") + .SetQueryParam("partner", request.Partner is null ? null : client.JsonSerializer.Serialize(request.Partner)) + .SetQueryParam("authorized_data", request.AuthorizedData is null ? null : client.JsonSerializer.Serialize(request.AuthorizedData)) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs index a6e38f2b..9d1685c3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs @@ -74,18 +74,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities") + .SetQueryParam("activity_name", request.ActivityName) + .SetQueryParam("activity_status", request.ActivityStatus) + .SetQueryParam("award_type", request.AwardType) .SetQueryParam("limit", request.Limit.ToString()) .SetQueryParam("offset", request.Offset.ToString()); - if (request.ActivityName is not null) - flurlReq.SetQueryParam("activity_name", request.ActivityName); - - if (request.ActivityStatus is not null) - flurlReq.SetQueryParam("activity_status", request.ActivityStatus); - - if (request.AwardType is not null) - flurlReq.SetQueryParam("award_type", request.AwardType); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -153,13 +147,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities", request.ActivityId, "merchants"); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities", request.ActivityId, "merchants") + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -205,13 +195,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities", request.ActivityId, "goods"); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities", request.ActivityId, "goods") + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingWithdrawFavorExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingWithdrawFavorExtensions.cs index 116ffef3..c6aa0f89 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingWithdrawFavorExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingWithdrawFavorExtensions.cs @@ -50,13 +50,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "withdraw-favor", "users", request.OpenId, "coupons") .SetQueryParam("appid", request.AppId) .SetQueryParam("mchid", request.CreatorMerchantId) - .SetQueryParam("stock_id", request.StockId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("stock_id", request.StockId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundExtensions.cs index aa9b8fe5..e4dc4aa3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundExtensions.cs @@ -80,10 +80,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateFlurlRequest(request, HttpMethod.Get, "merchantfund", "merchant", "income-records") .SetQueryParam("account_type", request.AccountType) .SetQueryParam("date", request.DateString) - .SetQueryParam("limit", request.Limit); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset); + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -109,10 +107,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("account_type", request.AccountType) .SetQueryParam("date", request.DateString) - .SetQueryParam("limit", request.Limit); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset); + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -204,10 +200,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "merchant", "fund", "withdraw", "bill-type", request.BillType) - .SetQueryParam("bill_date", request.BillDateString); - - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); + .SetQueryParam("bill_date", request.BillDateString) + .SetQueryParam("tar_type", request.TarType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs index eb5a5419..028e5fb1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs @@ -49,22 +49,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "merchant-risk-manage", "trade-risk-information") - .SetQueryParam("out_trade_no", request.OutTradeNumber); - - if (request.MerchantId is not null) - flurlReq.SetQueryParam("sp_mchid", request.MerchantId); - - if (request.AcquiringBankId is not null) - flurlReq.SetQueryParam("acquiring_bank_id", request.AcquiringBankId); - - if (request.ChannelId is not null) - flurlReq.SetQueryParam("channel_id", request.ChannelId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.ComplaintsInformation is not null) - flurlReq.SetQueryParam("complaints_information", request.ComplaintsInformation); + .SetQueryParam("sp_mchid", request.MerchantId) + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("out_trade_no", request.OutTradeNumber) + .SetQueryParam("acquiring_bank_id", request.AcquiringBankId) + .SetQueryParam("channel_id", request.ChannelId) + .SetQueryParam("complaints_information", request.ComplaintsInformation); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs index 5e117646..1cfd875c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs @@ -31,17 +31,11 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "merchant-service", "complaints-v2") + .SetQueryParam("complainted_mchid", request.ComplaintedMerchantId) .SetQueryParam("begin_date", request.BeginDateString) - .SetQueryParam("end_date", request.EndDateString); - - if (request.ComplaintedMerchantId is not null) - flurlReq.SetQueryParam("complainted_mchid", request.ComplaintedMerchantId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("end_date", request.EndDateString) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -87,13 +81,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "merchant-service", "complaints-v2", request.ComplaintId, "negotiation-historys"); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .CreateFlurlRequest(request, HttpMethod.Get, "merchant-service", "complaints-v2", request.ComplaintId, "negotiation-historys") + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantStoreExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantStoreExtensions.cs index a6e80bcc..aa9dcd75 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantStoreExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantStoreExtensions.cs @@ -40,10 +40,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "merchant-store", "stores", request.StoreId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "merchant-store", "stores", request.StoreId) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantWeeklyDiscountExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantWeeklyDiscountExtensions.cs index c827b28b..0e14441b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantWeeklyDiscountExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantWeeklyDiscountExtensions.cs @@ -49,14 +49,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "marketing", "weekly-discount", "activities") .SetQueryParam("applying_merchant_id", request.ApplyingMerchantId) + .SetQueryParam("store_id", request.StoreId) .SetQueryParam("activity_area_code", request.ActivityAreaCode) .SetQueryParam("activity_scene", request.ActivityScene) .SetQueryParam("limit", request.Limit) .SetQueryParam("offset", request.Offset); - if (request.StoreId is not null) - flurlReq.SetQueryParam("store_id", request.StoreId.Value); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteNewTaxControlFapiaoExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteNewTaxControlFapiaoExtensions.cs index 19897568..eb04d8de 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteNewTaxControlFapiaoExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteNewTaxControlFapiaoExtensions.cs @@ -97,10 +97,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "merchant", "development-config"); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mch_code", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "merchant", "development-config") + .SetQueryParam("sub_mch_code", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -123,10 +121,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "merchant", "base-information"); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "merchant", "base-information") + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -150,12 +146,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "merchant", "tax-codes") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("offset", request.Offset) .SetQueryParam("limit", request.Limit); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion @@ -180,29 +174,17 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "user-title", "title-url") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("fapiao_apply_id", request.FapiaoApplyId) .SetQueryParam("source", request.Source) .SetQueryParam("total_amount", request.TotalAmount) .SetQueryParam("appid", request.AppId) - .SetQueryParam("openid", request.OpenId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.SellerName is not null) - flurlReq.SetQueryParam("seller_name", request.SellerName); - - if (request.RequireShowMobileCell is not null) - flurlReq.SetQueryParam("show_phone_cell", request.RequireShowMobileCell.Value ? "true" : "false"); - - if (request.RequireMustInputMobile is not null) - flurlReq.SetQueryParam("must_input_phone", request.RequireMustInputMobile.Value ? "true" : "false"); - - if (request.RequireShowEmailCell is not null) - flurlReq.SetQueryParam("show_email_cell", request.RequireShowEmailCell.Value ? "true" : "false"); - - if (request.RequireMustInputEmail is not null) - flurlReq.SetQueryParam("must_input_email", request.RequireMustInputEmail.Value ? "true" : "false"); + .SetQueryParam("openid", request.OpenId) + .SetQueryParam("seller_name", request.SellerName) + .SetQueryParam("show_phone_cell", request.RequireShowMobileCell.HasValue ? request.RequireShowMobileCell.Value ? "true" : "false" : null) + .SetQueryParam("must_input_phone", request.RequireMustInputMobile.HasValue ? request.RequireMustInputMobile.Value ? "true" : "false" : null) + .SetQueryParam("show_email_cell", request.RequireShowEmailCell.HasValue ? request.RequireShowEmailCell.Value ? "true" : "false" : null) + .SetQueryParam("must_input_email", request.RequireMustInputEmail.HasValue ? request.RequireMustInputEmail.Value ? "true" : "false" : null); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -226,12 +208,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "user-title") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("fapiao_apply_id", request.FapiaoApplyId) .SetQueryParam("scene", request.Scene); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion @@ -301,13 +281,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "fapiao-applications", request.FapiaoApplyId); - - if (request.FapiaoId is not null) - flurlReq.SetQueryParam("fapiao_id", request.FapiaoId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "fapiao-applications", request.FapiaoApplyId) + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("fapiao_id", request.FapiaoId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -330,13 +306,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "fapiao-applications", request.FapiaoApplyId, "fapiao-files"); - - if (request.FapiaoId is not null) - flurlReq.SetQueryParam("fapiao_id", request.FapiaoId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "new-tax-control-fapiao", "fapiao-applications", request.FapiaoApplyId, "fapiao-files") + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("fapiao_id", request.FapiaoId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -366,14 +338,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateFlurlRequest(request, HttpMethod.Get, request.DownloadUrl) .WithUrl(request.DownloadUrl) .SetQueryParam("mchid", request.MerchantId) + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("openid", request.OpenId) .SetQueryParam("fapiao_id", request.FapiaoId) .SetQueryParam("invoice_code", request.FapiaoCode) .SetQueryParam("invoice_no", request.FapiaoNumber); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerTransferExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerTransferExtensions.cs index 1b3b8119..9a61e744 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerTransferExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePartnerTransferExtensions.cs @@ -50,16 +50,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "partner-transfer", "batches", "out-batch-no", request.OutBatchNumber) - .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false"); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_status", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false") + .SetQueryParam("detail_status", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -82,16 +76,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "partner-transfer", "batches", "batch-id", request.BatchId) - .SetQueryParam("need_query_detail", request.RequireQueryDetail); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_status", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail) + .SetQueryParam("detail_status", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerExtensions.cs index 53991ae0..8c60d7fb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerExtensions.cs @@ -121,13 +121,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("appid", request.AppId) - .SetQueryParam("sub_appid", request.SubAppId); - - if (request.OpenId is not null) - flurlReq.SetQueryParam("openid", request.OpenId); - - if (request.SubOpenId is not null) - flurlReq.SetQueryParam("sub_openid", request.SubOpenId); + .SetQueryParam("sub_appid", request.SubAppId) + .SetQueryParam("openid", request.OpenId) + .SetQueryParam("sub_openid", request.SubOpenId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayrollCardExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayrollCardExtensions.cs index b952f821..9c87859c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayrollCardExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayrollCardExtensions.cs @@ -47,16 +47,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "payroll-card", "relations", request.OpenId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.AppId is not null) - flurlReq.SetQueryParam("appid", request.AppId); - - if (request.SubAppId is not null) - flurlReq.SetQueryParam("sub_appid", request.SubAppId); + .CreateFlurlRequest(request, HttpMethod.Get, "payroll-card", "relations", request.OpenId) + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("appid", request.AppId) + .SetQueryParam("sub_appid", request.SubAppId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -101,10 +95,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "payroll-card", "authentications", request.AuthenticateNumber); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "payroll-card", "authentications", request.AuthenticateNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -127,28 +119,14 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "payroll-card", "authentications") - .SetQueryParam("openid", request.OpenId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.AppId is not null) - flurlReq.SetQueryParam("appid", request.AppId); - - if (request.SubAppId is not null) - flurlReq.SetQueryParam("sub_appid", request.SubAppId); - - if (request.AuthenticateDateString is not null) - flurlReq.SetQueryParam("authenticate_date", request.AuthenticateDateString); - - if (request.AuthenticateState is not null) - flurlReq.SetQueryParam("authenticate_state", request.AuthenticateState); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset); + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("appid", request.AppId) + .SetQueryParam("sub_appid", request.SubAppId) + .SetQueryParam("openid", request.OpenId) + .SetQueryParam("authenticate_date", request.AuthenticateDateString) + .SetQueryParam("authenticate_state", request.AuthenticateState) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePlatformSolutionExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePlatformSolutionExtensions.cs index 90471617..202d5ee9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePlatformSolutionExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePlatformSolutionExtensions.cs @@ -50,16 +50,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "platsolution", "mch-transfer", "batches", "out-batch-no", request.OutBatchNumber) .SetQueryParam("sub_mchid", request.SubMerchantId) - .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false"); - - if (request.DetailState is not null) - flurlReq.SetQueryParam("detail_state", request.DetailState); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false") + .SetQueryParam("detail_state", request.DetailState) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -83,16 +77,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "platsolution", "mch-transfer", "batches", "batch-id", request.BatchId) .SetQueryParam("sub_mchid", request.SubMerchantId) - .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false"); - - if (request.DetailState is not null) - flurlReq.SetQueryParam("detail_state", request.DetailState); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail ? "true" : "false") + .SetQueryParam("detail_state", request.DetailState) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs index 9a799276..12be6da7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs @@ -51,11 +51,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "profitsharing", "orders", request.OutOrderNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("transaction_id", request.TransactionId); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -101,11 +99,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "profitsharing", "return-orders", request.OutReturnNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("out_order_no", request.OutOrderNumber); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -245,13 +241,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "profitsharing", "bills") - .SetQueryParam("bill_date", request.BillDateString); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.TarType is not null) - flurlReq.SetQueryParam("tar_type", request.TarType); + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("bill_date", request.BillDateString) + .SetQueryParam("tar_type", request.TarType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs index 7bc1eb3c..99f4b791 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs @@ -80,10 +80,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "refund", "domestic", "refunds", request.OutRefundNumber); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "refund", "domestic", "refunds", request.OutRefundNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs index b0190f8b..bf2298f7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs @@ -74,25 +74,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "smartguide", "guides") - .SetQueryParam("store_id", request.StoreId.ToString()); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - - if (request.UserId is not null) - flurlReq.SetQueryParam("userid", request.UserId); - - if (request.UserMobile is not null) - flurlReq.SetQueryParam("mobile", request.UserMobile); - - if (request.UserWorkId is not null) - flurlReq.SetQueryParam("work_id", request.UserWorkId); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value.ToString()); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); + .SetQueryParam("sub_mchid", request.SubMerchantId) + .SetQueryParam("store_id", request.StoreId) + .SetQueryParam("userid", request.UserId) + .SetQueryParam("mobile", request.UserMobile) + .SetQueryParam("work_id", request.UserWorkId) + .SetQueryParam("limit", request.Limit) + .SetQueryParam("offset", request.Offset); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteTransferExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteTransferExtensions.cs index 7239ba7f..f72c2d66 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteTransferExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteTransferExtensions.cs @@ -50,16 +50,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "transfer", "batches", "out-batch-no", request.OutBatchNumber) - .SetQueryParam("need_query_detail", request.RequireQueryDetail); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_status", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail) + .SetQueryParam("detail_status", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -82,16 +76,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "transfer", "batches", "batch-id", request.BatchId) - .SetQueryParam("need_query_detail", request.RequireQueryDetail); - - if (request.DetailStatus is not null) - flurlReq.SetQueryParam("detail_status", request.DetailStatus); - - if (request.Offset is not null) - flurlReq.SetQueryParam("offset", request.Offset.Value); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit.Value); + .SetQueryParam("need_query_detail", request.RequireQueryDetail) + .SetQueryParam("detail_status", request.DetailStatus) + .SetQueryParam("offset", request.Offset) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -229,10 +217,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "transfer-detail", "electronic-receipts") .SetQueryParam("accept_type", request.AcceptType) - .SetQueryParam("out_detail_no", request.OutDetailNumber); - - if (request.OutBatchNumber is not null) - flurlReq.SetQueryParam("out_batch_no", request.OutBatchNumber); + .SetQueryParam("out_detail_no", request.OutDetailNumber) + .SetQueryParam("out_batch_no", request.OutBatchNumber); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs index 01004cb8..e1f0c634 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteVehicleExtensions.cs @@ -29,14 +29,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "parking", "services", "find") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("appid", request.AppId) .SetQueryParam("plate_number", request.PlateNumber) .SetQueryParam("plate_color", request.PlateColor) .SetQueryParam("openid", request.OpenId); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -106,10 +104,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "transactions", "out-trade-no", request.OutTradeNumber); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "transactions", "out-trade-no", request.OutTradeNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -178,12 +174,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "users", request.OpenId, "contracts") + .SetQueryParam("sub_mchid", request.SubMerchantId) .SetQueryParam("plan_id", request.PlanId) .SetQueryParam("plate_number", request.PlateNumber); - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -204,10 +198,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "contracts", request.ContractId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "contracts", request.ContractId) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -229,10 +221,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "transactions", "out-trade-no", request.OutTradeNumber); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "transactions", "out-trade-no", request.OutTradeNumber) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -254,10 +244,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "transactions", "id", request.TransactionId); - - if (request.SubMerchantId is not null) - flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); + .CreateFlurlRequest(request, HttpMethod.Get, "vehicle", "etc", "transactions", "id", request.TransactionId) + .SetQueryParam("sub_mchid", request.SubMerchantId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs index 6c1e4865..ab4ede28 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinCorpExtensions.cs @@ -27,10 +27,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "corp", "get_join_qrcode") - .SetQueryParam("access_token", request.AccessToken); - - if (request.SizeType is not null) - flurlReq.SetQueryParam("size_type", request.SizeType.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("size_type", request.SizeType); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs index aa25306d..110f9553 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinDepartmentExtensions.cs @@ -105,10 +105,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "list") - .SetQueryParam("access_token", request.AccessToken); - - if (request.ParentDepartmentId is not null) - flurlReq.SetQueryParam("id", request.ParentDepartmentId.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("id", request.ParentDepartmentId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -132,10 +130,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "department", "simplelist") - .SetQueryParam("access_token", request.AccessToken); - - if (request.ParentDepartmentId is not null) - flurlReq.SetQueryParam("id", request.ParentDepartmentId.Value); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("id", request.ParentDepartmentId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs index 4c7b9c51..9f8d4735 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinExmailExtensions.cs @@ -217,11 +217,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "group", "search") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("groupid", request.GroupId) .SetQueryParam("fuzzy", request.IsFuzzy ? 1 : 0); - if (request.GroupId is not null) - flurlReq.SetQueryParam("groupid", request.GroupId); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -339,11 +337,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "exmail", "publicmail", "search") .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("email", request.EmailOrName) .SetQueryParam("fuzzy", request.IsFuzzy ? 1 : 0); - if (request.EmailOrName is not null) - flurlReq.SetQueryParam("email", request.EmailOrName); - return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs index 00d0a00a..0aa90ddb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinSchoolExtensions.cs @@ -173,10 +173,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "user", "list") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("department_id", request.DeparmentId); - - if (request.RequireFetchChild is not null) - flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); + .SetQueryParam("department_id", request.DeparmentId) + .SetQueryParam("fetch_child", request.RequireFetchChild.HasValue ? request.RequireFetchChild.Value ? 1 : 0 : null); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -664,10 +662,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "school", "department", "list") - .SetQueryParam("access_token", request.AccessToken); - - if (request.ParentDepartmentId is not null) - flurlReq.SetQueryParam("id", request.ParentDepartmentId); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("id", request.ParentDepartmentId); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs index c4d247b0..abc1adb1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Work/Extensions/WechatWorkClientExecuteCgibinUserExtensions.cs @@ -157,10 +157,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "simplelist") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("department_id", request.DepartmentId); - - if (request.RequireFetchChild is not null) - flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); + .SetQueryParam("department_id", request.DepartmentId) + .SetQueryParam("fetch_child", request.RequireFetchChild.HasValue ? request.RequireFetchChild.Value ? 1 : 0 : null); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -186,10 +184,8 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "list") .SetQueryParam("access_token", request.AccessToken) - .SetQueryParam("department_id", request.DepartmentId); - - if (request.RequireFetchChild is not null) - flurlReq.SetQueryParam("fetch_child", request.RequireFetchChild.Value ? 1 : 0); + .SetQueryParam("department_id", request.DepartmentId) + .SetQueryParam("fetch_child", request.RequireFetchChild.HasValue ? request.RequireFetchChild.Value ? 1 : 0 : null); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } @@ -432,13 +428,9 @@ namespace SKIT.FlurlHttpClient.Wechat.Work IFlurlRequest flurlReq = client .CreateFlurlRequest(request, HttpMethod.Get, "cgi-bin", "user", "list_member_auth") - .SetQueryParam("access_token", request.AccessToken); - - if (request.Cursor is not null) - flurlReq.SetQueryParam("cursor", request.Cursor); - - if (request.Limit is not null) - flurlReq.SetQueryParam("limit", request.Limit); + .SetQueryParam("access_token", request.AccessToken) + .SetQueryParam("cursor", request.Cursor) + .SetQueryParam("limit", request.Limit); return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); }