From 36c0a6e5709405ed5637b4646eb7c6064003dd2f Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 7 Jan 2022 12:58:44 +0800 Subject: [PATCH] style(tenpayv3): clean code --- ...ClientExecuteApplyForSubMerchantExtensions.cs | 6 +++--- ...npayClientExecuteApplyForSubjectExtensions.cs | 6 +++--- .../WechatTenpayClientExecuteBillExtensions.cs | 10 +++++----- ...yClientExecuteBrandProfitSharingExtensions.cs | 10 +++++----- ...enpayClientExecuteBusinessCircleExtensions.cs | 2 +- ...tTenpayClientExecuteCertificatesExtensions.cs | 2 +- ...yClientExecuteCombineTransactionExtensions.cs | 2 +- ...tTenpayClientExecuteDiscountCardExtensions.cs | 2 +- ...ClientExecuteEcommerceApplymentsExtensions.cs | 4 ++-- ...TenpayClientExecuteEcommerceBillExtensions.cs | 2 +- ...lientExecuteEcommerceFundBalanceExtensions.cs | 4 ++-- ...ientExecuteEcommerceFundWithdrawExtensions.cs | 4 ++-- ...entExecuteEcommerceProfitSharingExtensions.cs | 8 ++++---- ...payClientExecuteEcommerceRefundsExtensions.cs | 6 +++--- ...yClientExecuteMarketingBusifavorExtensions.cs | 10 +++++----- ...enpayClientExecuteMarketingFavorExtensions.cs | 16 ++++++++-------- ...ientExecuteMarketingPartnershipsExtensions.cs | 2 +- ...tExecuteMarketingPayGiftActivityExtensions.cs | 8 ++++---- ...ClientExecuteMerchantFundBalanceExtensions.cs | 4 ++-- ...ExecuteMerchantFundIncomeRecordsExtensions.cs | 4 ++-- ...lientExecuteMerchantFundWithdrawExtensions.cs | 6 +++--- ...yClientExecuteMerchantRiskManageExtensions.cs | 2 +- ...npayClientExecuteMerchantServiceExtensions.cs | 12 ++++++------ ...entExecutePayPartnerTransactionsExtensions.cs | 4 ++-- ...tTenpayClientExecutePayScoreBillExtensions.cs | 2 +- ...xecutePayScorePartnerPermissionsExtensions.cs | 4 ++-- ...ecutePayScorePartnerServiceOrderExtensions.cs | 4 ++-- ...ClientExecutePayScorePermissionsExtensions.cs | 4 ++-- ...lientExecutePayScoreServiceOrderExtensions.cs | 4 ++-- ...npayClientExecutePayTransactionsExtensions.cs | 4 ++-- ...TenpayClientExecuteProfitSharingExtensions.cs | 10 +++++----- .../WechatTenpayClientExecuteRefundExtensions.cs | 2 +- ...hatTenpayClientExecuteSmartGuideExtensions.cs | 2 +- .../CodeStyleUtil.cs | 6 +++--- 34 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs index 12241827..9b585990 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs @@ -50,7 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "applyment4sub", "applyment", "business_code", request.BusinessCode); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -69,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "applyment4sub", "applyment", "applyment_id", request.ApplymentId.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -109,7 +109,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "apply4sub", "sub_merchants", request.SubMerchantId, "settlement"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubjectExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubjectExtensions.cs index 6fcc3fd7..e3e59269 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubjectExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubjectExtensions.cs @@ -50,7 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "apply4subject", "applyment") .SetQueryParam("business_code", request.BusinessCode); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -70,7 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "apply4subject", "applyment") .SetQueryParam("applyment_id", request.ApplymentId.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -127,7 +127,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "apply4subject", "applyment", "merchants", request.SubMerchantId, "state"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs index 05174ef7..8770087d 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs @@ -52,7 +52,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -90,7 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -123,7 +123,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -156,10 +156,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get); + .CreateRequest(request, HttpMethod.Get, request.DownloadUrl); flurlReq.Url = new Url(new Uri(request.DownloadUrl)); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBrandProfitSharingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBrandProfitSharingExtensions.cs index 4d371c26..669a6aa4 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBrandProfitSharingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBrandProfitSharingExtensions.cs @@ -52,7 +52,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("transaction_id", request.TransactionId) .SetQueryParam("out_order_no", request.OutOrderNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -93,7 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("out_order_no", request.OutOrderNumber) .SetQueryParam("out_return_no", request.OutReturnNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -115,7 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("order_id", request.OrderId) .SetQueryParam("out_return_no", request.OutReturnNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -153,7 +153,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "brand", "profitsharing", "orders", request.TransactionId, "amounts"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -172,7 +172,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "brand", "profitsharing", "brand-configs", request.BrandMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs index bfb04b8f..0861423b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBusinessCircleExtensions.cs @@ -55,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.SubMerchantId != null) flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs index 0ec0457b..49d22116 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs @@ -31,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "certificates"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCombineTransactionExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCombineTransactionExtensions.cs index a33ff719..22d9938e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCombineTransactionExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCombineTransactionExtensions.cs @@ -161,7 +161,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "combine-transactions", "out-trade-no", request.CombineOutTradeNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteDiscountCardExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteDiscountCardExtensions.cs index 32c14fb5..b215c778 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteDiscountCardExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteDiscountCardExtensions.cs @@ -71,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "discount-card", "cards", request.OutCardCode) ; - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceApplymentsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceApplymentsExtensions.cs index 21d72534..1f6db1fb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceApplymentsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceApplymentsExtensions.cs @@ -47,7 +47,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "ecommerce", "applyments", request.ApplymentId.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -66,7 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "ecommerce", "applyments", "out-request-no", request.OutRequestNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceBillExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceBillExtensions.cs index 2a89979c..39d861ac 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceBillExtensions.cs @@ -36,7 +36,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs index a190cafd..0c783626 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs @@ -36,7 +36,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.AccountType != null) flurlReq.SetQueryParam("account_type", request.AccountType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -57,7 +57,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "fund", "enddaybalance", request.SubMerchantId) .SetQueryParam("date", request.DateString); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundWithdrawExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundWithdrawExtensions.cs index 11c5a77a..d986afbe 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundWithdrawExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundWithdrawExtensions.cs @@ -53,7 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "fund", "withdraw", "out-request-no", request.OutRequestNumber) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -74,7 +74,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "fund", "withdraw", request.WithdrawId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs index e408d819..3be4e7a7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs @@ -53,7 +53,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("transaction_id", request.TransactionId) .SetQueryParam("out_order_no", request.OutOrderNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -95,7 +95,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("out_order_no", request.OutOrderNumber) .SetQueryParam("out_return_no", request.OutReturnNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -117,7 +117,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("order_id", request.OrderId) .SetQueryParam("out_return_no", request.OutReturnNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -157,7 +157,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "profitsharing", "orders", request.TransactionId, "amounts") ; - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceRefundsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceRefundsExtensions.cs index f7d10fd6..55ba9234 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceRefundsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceRefundsExtensions.cs @@ -51,7 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "refunds", "out-refund-no", request.OutRefundNumber) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -71,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "refunds", "id", request.RefundId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -111,7 +111,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "ecommerce", "refunds", request.RefundId, "return-advance") .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs index fd3ccb7d..9860a8ee 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingBusifavorExtensions.cs @@ -54,7 +54,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "marketing", "busifavor", "stocks", request.StockId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -134,7 +134,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "marketing", "busifavor", "users", request.OpenId, "coupons", request.CouponCode, "appids", request.AppId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -176,7 +176,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -319,7 +319,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "marketing", "busifavor", "callbacks") .SetQueryParam("mchid", request.MerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -388,7 +388,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "marketing", "busifavor", "subsidy", "pay-receipts", request.SubsidyReceiptId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs index 472f6a9b..6e877b8e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingFavorExtensions.cs @@ -131,7 +131,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "marketing", "favor", "stocks", request.StockId) .SetQueryParam("stock_creator_mchid", request.StockCreatorMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -166,7 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Status != null) flurlReq.SetQueryParam("status", request.Status); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -192,7 +192,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("limit", request.Limit.ToString()) .SetQueryParam("offset", request.Offset.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -218,7 +218,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("limit", request.Limit.ToString()) .SetQueryParam("offset", request.Offset.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -239,7 +239,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "marketing", "favor", "stocks", request.StockId, "use-flow") ; - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -260,7 +260,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "marketing", "favor", "stocks", request.StockId, "refund-flow") ; - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -305,7 +305,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "marketing", "favor", "users", request.OpenId, "coupons", request.CouponId) .SetQueryParam("appid", request.AppId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -347,7 +347,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs index 4cb2ccab..a0224a3c 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs @@ -85,7 +85,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs index 02a13a6a..ec2e3252 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs @@ -51,7 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "marketing", "paygiftactivity", "activities", request.ActivityId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -82,7 +82,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.AwardType != null) flurlReq.SetQueryParam("award_type", request.AwardType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -148,7 +148,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -194,7 +194,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundBalanceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundBalanceExtensions.cs index cd6e0436..1415b7e3 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundBalanceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundBalanceExtensions.cs @@ -31,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant", "fund", "balance", request.AccountType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -52,7 +52,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "merchant", "fund", "dayendbalance", request.AccountType) .SetQueryParam("date", request.DateString); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundIncomeRecordsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundIncomeRecordsExtensions.cs index 6c7a688e..d9e69e9e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundIncomeRecordsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundIncomeRecordsExtensions.cs @@ -37,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -63,7 +63,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundWithdrawExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundWithdrawExtensions.cs index 107ee2da..c6f6c6cc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundWithdrawExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantFundWithdrawExtensions.cs @@ -49,7 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant", "fund", "withdraw", "out-request-no", request.OutRequestNumber); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -68,7 +68,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant", "fund", "withdraw", request.WithdrawId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -92,7 +92,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs index d8b8c997..10ea7980 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantRiskManageExtensions.cs @@ -51,7 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant-risk-manage", "violation-notifications"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs index 12affeaf..32d0ab22 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs @@ -44,7 +44,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -64,7 +64,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant-service", "complaints-v2", request.ComplaintId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -90,7 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -176,7 +176,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "merchant-service", "complaint-notifications"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -273,10 +273,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(request, HttpMethod.Get); + .CreateRequest(request, HttpMethod.Get, request.DownloadUrl); flurlReq.Url = new Url(new Uri(request.DownloadUrl)); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs index 2e5615e3..87fc86c5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs @@ -133,7 +133,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("sp_mchid", request.MerchantId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -162,7 +162,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("sp_mchid", request.MerchantId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreBillExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreBillExtensions.cs index eb82a52a..cc069cad 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreBillExtensions.cs @@ -32,7 +32,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("tar_type", request.TarType) .SetQueryParam("algorithm", request.Algorithm); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerPermissionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerPermissionsExtensions.cs index 94d069fa..c298fbde 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerPermissionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerPermissionsExtensions.cs @@ -51,7 +51,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -99,7 +99,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.SubOpenId != null) flurlReq.SetQueryParam("sub_openid", request.SubOpenId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs index aa2c640a..b9f696eb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs @@ -52,7 +52,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -74,7 +74,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePermissionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePermissionsExtensions.cs index 31ba2327..6e59dfe9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePermissionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePermissionsExtensions.cs @@ -50,7 +50,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "payscore", "permissions", "authorization-code", request.AuthorizationCode) .SetQueryParam("service_id", request.ServiceId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -90,7 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("appid", request.AppId) .SetQueryParam("service_id", request.ServiceId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreServiceOrderExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreServiceOrderExtensions.cs index 5b11d95d..a14391d8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreServiceOrderExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScoreServiceOrderExtensions.cs @@ -71,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("appid", request.AppId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -93,7 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .SetQueryParam("service_id", request.ServiceId) .SetQueryParam("appid", request.AppId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayTransactionsExtensions.cs index ed9b5623..ae970f03 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayTransactionsExtensions.cs @@ -127,7 +127,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "pay", "transactions", "out-trade-no", request.OutTradeNumber) .SetQueryParam("mchid", request.MerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -154,7 +154,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 .CreateRequest(request, HttpMethod.Get, "pay", "transactions", "id", request.TransactionId) .SetQueryParam("mchid", request.MerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs index 0679b907..6e5bc475 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteProfitSharingExtensions.cs @@ -55,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.SubMerchantId != null) flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -100,7 +100,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.SubMerchantId != null) flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -140,7 +140,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "profitsharing", "transactions", request.TransactionId, "amounts"); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -159,7 +159,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 IFlurlRequest flurlReq = client .CreateRequest(request, HttpMethod.Get, "profitsharing", "merchant-configs", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// @@ -227,7 +227,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.TarType != null) flurlReq.SetQueryParam("tar_type", request.TarType); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } #endregion } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs index 1ccfb834..d4aba230 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRefundExtensions.cs @@ -76,7 +76,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.SubMerchantId != null) flurlReq.SetQueryParam("sub_mchid", request.SubMerchantId); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs index 6b615ac5..e9003abc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteSmartGuideExtensions.cs @@ -90,7 +90,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request.Offset != null) flurlReq.SetQueryParam("offset", request.Offset.Value.ToString()); - return await client.SendRequestWithJsonAsync(flurlReq, cancellationToken: cancellationToken); + return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); } /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs index 748e03a9..41882683 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TestTools/CodeStyleUtil.cs @@ -462,7 +462,7 @@ namespace SKIT.FlurlHttpClient.Wechat string[] actualUrlSegments = actualUrl.Split(',', StringSplitOptions.RemoveEmptyEntries).Select(e => e.Trim()).ToArray(); if (expectedUrlSegments.Length != actualUrlSegments.Length) { - lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致。")); + lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致(段数不等)。")); return false; } else @@ -475,7 +475,7 @@ namespace SKIT.FlurlHttpClient.Wechat { if (actualUrlSegment.StartsWith("\"")) { - lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致。")); + lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致(预期为变量展位符,实际为常量字符串)。")); break; } } @@ -484,7 +484,7 @@ namespace SKIT.FlurlHttpClient.Wechat actualUrlSegment = actualUrlSegment.Replace("\"", string.Empty).Trim('/'); if (!string.Equals(expectedUrlSegment, actualUrlSegment)) { - lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致。")); + lstError.Add(new Exception($"[风格] 源代码 \"{extCodeFileName}\" 下第 {i + 1} 段文档注释有误,`[{expectedMethod}] {expectedUrl}` 与实际接口路由不一致(预期为常量展位符,实际为变量字符串)。")); break; } }