From 3ffeb7c0fd700954571c5767a691356c6783a854 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 7 Jun 2021 11:19:27 +0800 Subject: [PATCH] =?UTF-8?q?fix(tenpayv3):=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=88=86=E6=9E=90=E5=B7=A5=E5=85=B7=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=E5=87=BA=E7=9A=84=20API=20=E5=AE=9A=E4=B9=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ClientExecuteApplyForSubMerchantExtensions.cs | 3 ++- .../WechatTenpayClientExecuteBillExtensions.cs | 9 +++++---- ...tTenpayClientExecuteCertificatesExtensions.cs | 3 ++- ...lientExecuteEcommerceFundBalanceExtensions.cs | 4 ++-- ...entExecuteEcommerceProfitSharingExtensions.cs | 2 +- ...echatTenpayClientExecuteGoldPlanExtensions.cs | 4 ++-- ...ientExecuteMarketingPartnershipsExtensions.cs | 3 ++- ...tExecuteMarketingPayGiftActivityExtensions.cs | 2 +- ...npayClientExecuteMerchantServiceExtensions.cs | 3 ++- ...entExecutePayPartnerTransactionsExtensions.cs | 2 +- ...ecutePayScorePartnerServiceOrderExtensions.cs | 16 ++++++++-------- 11 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs index 81d6ae87..60d98d3e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteApplyForSubMerchantExtensions.cs @@ -28,7 +28,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "applyment4sub", "applyment"); + .CreateRequest(HttpMethod.Post, "applyment4sub", "applyment") + .SetOptions(request); 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 6c763e06..37e3fb65 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteBillExtensions.cs @@ -40,7 +40,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "bill/tradebill") + .CreateRequest(HttpMethod.Get, "bill", "tradebill") .SetOptions(request) .SetQueryParam("bill_date", request.BillDateString); @@ -82,7 +82,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "bill/fundflowbill") + .CreateRequest(HttpMethod.Get, "bill", "fundflowbill") .SetOptions(request) .SetQueryParam("bill_date", request.BillDateString); @@ -96,7 +96,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [GET] /billdownload/file 接口。 + /// 异步调用 [GET] /{download_url} 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_1_8.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_2_8.shtml /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/apis/chapter3_3_8.shtml @@ -121,7 +121,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, request.DownloadUrl); + .CreateRequest(HttpMethod.Get, request.DownloadUrl) + .SetOptions(request); return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs index 68ee3f5a..9d821dd5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteCertificatesExtensions.cs @@ -29,7 +29,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "certificates"); + .CreateRequest(HttpMethod.Get, "certificates") + .SetOptions(request); return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs index 996a0743..b2ae36e7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceFundBalanceExtensions.cs @@ -39,7 +39,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [GET] /ecommerce/fund/balance/enddaybalance/{sub_mchid} 接口。 + /// 异步调用 [GET] /ecommerce/fund/enddaybalance/{sub_mchid} 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3_partner/apis/chapter7_7_2.shtml /// /// @@ -52,7 +52,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "ecommerce", "fund", "enddaybalance", "balance", request.SubMerchantId) + .CreateRequest(HttpMethod.Get, "ecommerce", "fund", "enddaybalance", request.SubMerchantId) .SetOptions(request) .SetQueryParam("date", request.DateString); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs index 3c47331a..896a9713 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteEcommerceProfitSharingExtensions.cs @@ -157,7 +157,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "ecommerce", "profitsharing", "orders", request.TransactionId, "amounts", HttpMethod.Get) + .CreateRequest(HttpMethod.Get, "ecommerce", "profitsharing", "orders", request.TransactionId, "amounts") .SetOptions(request); return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteGoldPlanExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteGoldPlanExtensions.cs index 64ac0a09..72593796 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteGoldPlanExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteGoldPlanExtensions.cs @@ -28,7 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "apply4subject", "applyment") + .CreateRequest(HttpMethod.Post, "goldplan", "merchants", "changegoldplanstatus") .SetOptions(request); return await client.SendRequestWithJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken); @@ -48,7 +48,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "goldplan", "merchants", "hangecustompagestatus") + .CreateRequest(HttpMethod.Post, "goldplan", "merchants", "changecustompagestatus") .SetOptions(request); 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 3647fcd2..f3bf2ae8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPartnershipsExtensions.cs @@ -73,7 +73,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "marketing", "partnerships"); + .CreateRequest(HttpMethod.Get, "marketing", "partnerships") + .SetOptions(request); if (request.Partner != null) flurlReq.SetQueryParam("partner", client.JsonSerializer.Serialize(request.Partner)); diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs index 62ecb12b..b16b9450 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMarketingPayGiftActivityExtensions.cs @@ -172,7 +172,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Delete, "marketing", "paygiftactivity", "activities", request.ActivityId, "merchants", "delete") + .CreateRequest(HttpMethod.Post, "marketing", "paygiftactivity", "activities", request.ActivityId, "merchants", "delete") .SetOptions(request); 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 8a6ba2c3..8c443527 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteMerchantServiceExtensions.cs @@ -179,7 +179,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 if (request is null) throw new ArgumentNullException(nameof(request)); IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Get, "merchant-service", "complaint-notifications"); + .CreateRequest(HttpMethod.Get, "merchant-service", "complaint-notifications") + .SetOptions(request); return await client.SendRequestAsync(flurlReq, cancellationToken: cancellationToken); } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs index 1166ba75..92a3c317 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayPartnerTransactionsExtensions.cs @@ -105,7 +105,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 request.MerchantId = client.MerchantId; IFlurlRequest flurlReq = client - .CreateRequest(HttpMethod.Post, "pay", "transactions", "native") + .CreateRequest(HttpMethod.Post, "pay", "partner", "transactions", "native") .SetOptions(request); 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 36f73446..a0934fbb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions.cs @@ -15,7 +15,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 public static class WechatTenpayClientExecutePayScorePartnerServiceOrderExtensions { /// - /// 异步调用 [POST] /payscore/serviceorder 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_1.shtml /// /// @@ -35,7 +35,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [GET] /payscore/serviceorder 接口。 + /// 异步调用 [GET] /payscore/partner/serviceorder 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_2.shtml /// /// @@ -58,7 +58,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [GET] /payscore/serviceorder 接口。 + /// 异步调用 [GET] /payscore/partner/serviceorder 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_2.shtml /// /// @@ -81,7 +81,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [POST] /payscore/serviceorder/{out_order_no}/cancel 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder/{out_order_no}/cancel 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_3.shtml /// /// @@ -101,7 +101,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [POST] /payscore/serviceorder/{out_order_no}/modify 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder/{out_order_no}/modify 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_4.shtml /// /// @@ -121,7 +121,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [POST] /payscore/serviceorder/{out_order_no}/complete 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder/{out_order_no}/complete 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_5.shtml /// /// @@ -141,7 +141,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [POST] /payscore/serviceorder/{out_order_no}/pay 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder/{out_order_no}/pay 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_6.shtml /// /// @@ -161,7 +161,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 } /// - /// 异步调用 [POST] /payscore/serviceorder/{out_order_no}/sync 接口。 + /// 异步调用 [POST] /payscore/partner/serviceorder/{out_order_no}/sync 接口。 /// REF: https://pay.weixin.qq.com/wiki/doc/apiv3/wxpay/payscore_partner/chapter3_7.shtml /// ///