diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/PAPPay/HKPAPPayContractResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/PAPPay/PAPPayContractResource.cs
similarity index 90%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/PAPPay/HKPAPPayContractResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/PAPPay/PAPPayContractResource.cs
index da8f204c..9215ebdd 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/PAPPay/HKPAPPayContractResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/PAPPay/PAPPayContractResource.cs
@@ -1,12 +1,12 @@
using System;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 PAPAY.SIGN (仅限直连商户 For HK)通知的数据。
- /// 表示 PAPAY.TERMINATE (仅限直连商户 For HK)通知的数据。
+ /// 表示 PAPAY.SIGN (仅限直连商户)通知的数据。
+ /// 表示 PAPAY.TERMINATE (仅限直连商户)通知的数据。
///
- public class HKPAPPayContractResource : WechatTenpayEvent.Types.IDecryptedResource
+ public class PAPPayContractResource : WechatTenpayGlobalEvent.Types.IDecryptedResource
{
///
/// 获取或设置微信商户号。
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Refund/HKRefundResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Refund/RefundResource.cs
similarity index 86%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Refund/HKRefundResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Refund/RefundResource.cs
index 83fe47d9..f3512ea7 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Refund/HKRefundResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Refund/RefundResource.cs
@@ -1,17 +1,17 @@
using System;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 REFUND.SUCCESS (仅限直连商户 For HK)通知的数据。
- /// 表示 REFUND.ABNORMAL (仅限直连商户 For HK)通知的数据。
- /// 表示 REFUND.CLOSED (仅限直连商户 For HK)通知的数据。
+ /// 表示 REFUND.SUCCESS (仅限直连商户)通知的数据。
+ /// 表示 REFUND.ABNORMAL (仅限直连商户)通知的数据。
+ /// 表示 REFUND.CLOSED (仅限直连商户)通知的数据。
///
- public class HKRefundResource : WechatTenpayEvent.Types.IDecryptedResource
+ public class RefundResource : WechatTenpayGlobalEvent.Types.IDecryptedResource
{
public static class Types
{
- public class Amount : Models.GetHKRefundByOutRefundNumberResponse.Types.Amount
+ public class Amount : Models.GetRefundByOutRefundNumberResponse.Types.Amount
{
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Transactions/HKTransactionResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Transactions/TransactionResource.cs
similarity index 88%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Transactions/HKTransactionResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Transactions/TransactionResource.cs
index 89f70884..6f0aff53 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HK/Transactions/HKTransactionResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/Transactions/TransactionResource.cs
@@ -1,23 +1,23 @@
using System;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 TRANSACTION.SUCCESS (仅限直连商户 For HK)通知的数据。
+ /// 表示 TRANSACTION.SUCCESS (仅限直连商户)通知的数据。
///
- public class HKTransactionResource : WechatTenpayEvent.Types.IDecryptedResource
+ public class TransactionResource : WechatTenpayGlobalEvent.Types.IDecryptedResource
{
public static class Types
{
- public class Payer : Models.GetHKTransactionByOutTradeNumberResponse.Types.Payer
+ public class Payer : Models.GetTransactionByOutTradeNumberResponse.Types.Payer
{
}
- public class Amount : Models.GetHKTransactionByOutTradeNumberResponse.Types.Amount
+ public class Amount : Models.GetTransactionByOutTradeNumberResponse.Types.Amount
{
}
- public class Promotion : Models.GetHKTransactionByOutTradeNumberResponse.Types.Promotion
+ public class Promotion : Models.GetTransactionByOutTradeNumberResponse.Types.Promotion
{
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/PAPPay/HKPartnerPAPPayContractResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/PAPPay/PartnerPAPPayContractResource.cs
similarity index 76%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/PAPPay/HKPartnerPAPPayContractResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/PAPPay/PartnerPAPPayContractResource.cs
index 45341293..5ebbc2ea 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/PAPPay/HKPartnerPAPPayContractResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/PAPPay/PartnerPAPPayContractResource.cs
@@ -1,10 +1,10 @@
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 PAPAY.SIGN (仅限服务商 For HK)通知的数据。
- /// 表示 PAPAY.TERMINATE (仅限服务商 For HK)通知的数据。
+ /// 表示 PAPAY.SIGN (仅限服务商)通知的数据。
+ /// 表示 PAPAY.TERMINATE (仅限服务商)通知的数据。
///
- public class HKPartnerPAPPayContractResource : HKPAPPayContractResource, WechatTenpayEvent.Types.IDecryptedResource
+ public class PartnerPAPPayContractResource : PAPPayContractResource, WechatTenpayEvent.Types.IDecryptedResource
{
///
///
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Refund/HKPartnerRefundResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Refund/PartnerRefundResource.cs
similarity index 64%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Refund/HKPartnerRefundResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Refund/PartnerRefundResource.cs
index 953aa891..8185b778 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Refund/HKPartnerRefundResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Refund/PartnerRefundResource.cs
@@ -1,15 +1,15 @@
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 REFUND.SUCCESS (仅限服务商 For HK)通知的数据。
- /// 表示 REFUND.ABNORMAL (仅限服务商 For HK)通知的数据。
- /// 表示 REFUND.CLOSED (仅限服务商 For HK)通知的数据。
+ /// 表示 REFUND.SUCCESS (仅限服务商)通知的数据。
+ /// 表示 REFUND.ABNORMAL (仅限服务商)通知的数据。
+ /// 表示 REFUND.CLOSED (仅限服务商)通知的数据。
///
- public class HKPartnerRefundResource : HKRefundResource, WechatTenpayEvent.Types.IDecryptedResource
+ public class PartnerRefundResource : RefundResource, WechatTenpayGlobalEvent.Types.IDecryptedResource
{
public static new class Types
{
- public class Amount : Models.GetHKPartnerRefundByOutRefundNumberResponse.Types.Amount
+ public class Amount : Models.GetPartnerRefundByOutRefundNumberResponse.Types.Amount
{
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Transactions/HKPartnerTransactionResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Transactions/PartnerTransactionResource.cs
similarity index 78%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Transactions/HKPartnerTransactionResource.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Transactions/PartnerTransactionResource.cs
index 4b8c23eb..843a948c 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/_HKPartner/Transactions/HKPartnerTransactionResource.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Events/_Partner/Transactions/PartnerTransactionResource.cs
@@ -1,21 +1,21 @@
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global.Events
{
///
- /// 表示 TRANSACTION.SUCCESS (仅限服务商 For HK)通知的数据。
+ /// 表示 TRANSACTION.SUCCESS (仅限服务商)通知的数据。
///
- public class HKPartnerTransactionResource : HKTransactionResource, WechatTenpayEvent.Types.IDecryptedResource
+ public class PartnerTransactionResource : TransactionResource, WechatTenpayGlobalEvent.Types.IDecryptedResource
{
public static new class Types
{
- public class Payer : Models.GetHKPartnerTransactionByOutTradeNumberResponse.Types.Payer
+ public class Payer : Models.GetPartnerTransactionByOutTradeNumberResponse.Types.Payer
{
}
- public class Amount : Models.GetHKPartnerTransactionByOutTradeNumberResponse.Types.Amount
+ public class Amount : Models.GetPartnerTransactionByOutTradeNumberResponse.Types.Amount
{
}
- public class Promotion : Models.GetHKPartnerTransactionByOutTradeNumberResponse.Types.Promotion
+ public class Promotion : Models.GetPartnerTransactionByOutTradeNumberResponse.Types.Promotion
{
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventDecryptionExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventDecryptionExtensions.cs
new file mode 100644
index 00000000..9e9f2df1
--- /dev/null
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventDecryptionExtensions.cs
@@ -0,0 +1,47 @@
+using System;
+
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
+{
+ public static class WechatTenpayGlobalClientEventDecryptionExtensions
+ {
+ ///
+ /// 反序列化得到 对象。
+ ///
+ ///
+ ///
+ ///
+ public static WechatTenpayGlobalEvent DeserializeEvent(this WechatTenpayGlobalClient client, string webhookJson)
+ {
+ if (client is null) throw new ArgumentNullException(nameof(client));
+ if (webhookJson is null) throw new ArgumentNullException(webhookJson);
+
+ return client.JsonSerializer.Deserialize(webhookJson);
+ }
+
+ ///
+ /// 返回序列化并解密事件数据中被加密的通知数据。
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static T DecryptEventResource(this WechatTenpayGlobalClient client, WechatTenpayGlobalEvent webhookEvent)
+ where T : WechatTenpayGlobalEvent.Types.IDecryptedResource, new()
+ {
+ return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource(client, webhookEvent.Resource);
+ }
+
+ ///
+ /// 返回序列化并解密事件数据中被加密的通知数据。
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static T DecryptEventResource(this WechatTenpayGlobalClient client, WechatTenpayGlobalEvent.Types.Resource webhookEventResource)
+ where T : WechatTenpayGlobalEvent.Types.IDecryptedResource, new()
+ {
+ return WechatTenpayClientEventDecryptionExtensions.DecryptEventResource(client, webhookEventResource);
+ }
+ }
+}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventVerificationExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventVerificationExtensions.cs
new file mode 100644
index 00000000..a903517e
--- /dev/null
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientEventVerificationExtensions.cs
@@ -0,0 +1,90 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
+{
+ using SKIT.FlurlHttpClient.Primitives;
+
+ public static class WechatTenpayGlobalClientEventVerificationExtensions
+ {
+ ///
+ /// 验证回调通知事件签名。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ /// 微信回调通知中的 "Wechatpay-Timestamp" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Nonce" 请求标头。
+ /// 微信回调通知中请求正文。
+ /// 微信回调通知中的 "Wechatpay-Signature" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Serial" 请求标头。
+ ///
+ public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSerialNumber)
+ {
+ return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber);
+ }
+
+ ///
+ /// 验证回调通知事件签名。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ /// 微信回调通知中的 "Wechatpay-Timestamp" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Nonce" 请求标头。
+ /// 微信回调通知中请求正文。
+ /// 微信回调通知中的 "Wechatpay-Signature" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Signature-Type" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Serial" 请求标头。
+ ///
+ public static ErroredResult VerifyEventSignature(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSignatureType, string webhookSerialNumber)
+ {
+ return WechatTenpayClientEventVerificationExtensions.VerifyEventSignature(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber);
+ }
+
+ ///
+ /// 异步验证回调通知事件签名。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ /// 微信回调通知中的 "Wechatpay-Timestamp" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Nonce" 请求标头。
+ /// 微信回调通知中请求正文。
+ /// 微信回调通知中的 "Wechatpay-Signature" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Serial" 请求标头。
+ ///
+ ///
+ public static Task VerifyEventSignatureAsync(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSerialNumber, CancellationToken cancellationToken = default)
+ {
+ return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSerialNumber, cancellationToken);
+ }
+
+ ///
+ /// 异步验证回调通知事件签名。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ /// 微信回调通知中的 "Wechatpay-Timestamp" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Nonce" 请求标头。
+ /// 微信回调通知中请求正文。
+ /// 微信回调通知中的 "Wechatpay-Signature" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Signature-Type" 请求标头。
+ /// 微信回调通知中的 "Wechatpay-Serial" 请求标头。
+ ///
+ ///
+ public static Task VerifyEventSignatureAsync(this WechatTenpayGlobalClient client, string webhookTimestamp, string webhookNonce, string webhookBody, string webhookSignature, string webhookSignatureType, string webhookSerialNumber, CancellationToken cancellationToken = default)
+ {
+ return WechatTenpayClientEventVerificationExtensions.VerifyEventSignatureAsync(client, webhookTimestamp, webhookNonce, webhookBody, webhookSignature, webhookSignatureType, webhookSerialNumber, cancellationToken);
+ }
+ }
+}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCertificatesExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCertificatesExtensions.cs
new file mode 100644
index 00000000..4f8c0697
--- /dev/null
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCertificatesExtensions.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Flurl.Http;
+
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
+{
+ public static class WechatTenpayGlobalClientExecuteCertificatesExtensions
+ {
+ ///
+ /// 异步调用 [GET] /certificates 接口。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static async Task ExecuteQueryCertificatesAsync(this WechatTenpayGlobalClient client, Models.QueryCertificatesRequest request, CancellationToken cancellationToken = default)
+ {
+ if (client is null) throw new ArgumentNullException(nameof(client));
+ if (request is null) throw new ArgumentNullException(nameof(request));
+
+ IFlurlRequest flurlReq = client
+ .CreateFlurlRequest(request, HttpMethod.Get, "certificates");
+
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ }
+ }
+}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs
similarity index 67%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs
index 5f8dc32a..4fc8841a 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKCustomsExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteCustomsExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKCustomsExtensions
+ public static class WechatTenpayGlobalClientExecuteCustomsExtensions
{
///
/// 异步调用 [POST] /customs/orders 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKCustomsOrderAsync(this WechatTenpayClient client, Models.CreateHKCustomsOrderRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateCustomsOrderAsync(this WechatTenpayGlobalClient client, Models.CreateCustomsOrderRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -31,7 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "customs", "orders");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -40,13 +39,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteQueryHKCustomsOrdersAsync(this WechatTenpayClient client, Models.QueryHKCustomsOrdersRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteQueryCustomsOrdersAsync(this WechatTenpayGlobalClient client, Models.QueryCustomsOrdersRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -68,7 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (request.Limit is not null)
flurlReq.SetQueryParam("limit", request.Limit);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -77,13 +75,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteRedeclareHKCustomsOrderAsync(this WechatTenpayClient client, Models.RedeclareHKCustomsOrderRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteRedeclareCustomsOrderAsync(this WechatTenpayGlobalClient client, Models.RedeclareCustomsOrderRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -94,7 +91,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "customs", "redeclare");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -103,13 +100,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteModifyHKCustomsOrderAsync(this WechatTenpayClient client, Models.ModifyHKCustomsOrderRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteModifyCustomsOrderAsync(this WechatTenpayGlobalClient client, Models.ModifyCustomsOrderRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -120,7 +116,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, new HttpMethod("PATCH"), "customs", "orders");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -129,13 +125,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteVerifyHKCustomsCertificateAsync(this WechatTenpayClient client, Models.VerifyHKCustomsCertificateRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteVerifyCustomsCertificateAsync(this WechatTenpayGlobalClient client, Models.VerifyCustomsCertificateRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -146,7 +141,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "customs", "verify-certificate");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteMerchantsExtensions.cs
similarity index 66%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteMerchantsExtensions.cs
index 76221755..89eaa64b 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKMerchantsExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteMerchantsExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKMerchantsExtensions
+ public static class WechatTenpayGlobalClientExecuteMerchantsExtensions
{
///
/// 异步调用 [POST] /merchants 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteAddHKSubMerchantAsync(this WechatTenpayClient client, Models.AddHKSubMerchantRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteAddSubMerchantAsync(this WechatTenpayGlobalClient client, Models.AddSubMerchantRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -32,7 +31,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Post, "merchants")
.WithHeader("Idempotency-Key", request.IdempotencyKey);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -41,13 +40,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKSubMerchantAsync(this WechatTenpayClient client, Models.GetHKSubMerchantRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetSubMerchantAsync(this WechatTenpayGlobalClient client, Models.GetSubMerchantRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -60,7 +58,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sp_appid", request.AppId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -69,13 +67,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteModifyHKSubMerchantAsync(this WechatTenpayClient client, Models.ModifyHKSubMerchantRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteModifySubMerchantAsync(this WechatTenpayGlobalClient client, Models.ModifySubMerchantRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -86,7 +83,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Put, "merchants");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPAPPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePAPPayExtensions.cs
similarity index 65%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPAPPayExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePAPPayExtensions.cs
index 9a67b932..b4b4a41c 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPAPPayExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePAPPayExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKPAPPayExtensions
+ public static class WechatTenpayGlobalClientExecutePAPPayExtensions
{
///
/// 异步调用 [POST] /papay/contracts/app-pre-entrust-sign 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPAPPayContractEntrustAppAsync(this WechatTenpayClient client, Models.PresignHKPAPPayContractEntrustAppRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPAPPayContractEntrustAppAsync(this WechatTenpayGlobalClient client, Models.PresignPAPPayContractEntrustAppRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -28,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "app-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -37,13 +36,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPAPPayContractEntrustJsapiAsync(this WechatTenpayClient client, Models.PresignHKPAPPayContractEntrustJsapiRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPAPPayContractEntrustJsapiAsync(this WechatTenpayGlobalClient client, Models.PresignPAPPayContractEntrustJsapiRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -51,7 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "jsapi-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -60,13 +58,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPAPPayContractEntrustMiniProgramAsync(this WechatTenpayClient client, Models.PresignHKPAPPayContractEntrustMiniProgramRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPAPPayContractEntrustMiniProgramAsync(this WechatTenpayGlobalClient client, Models.PresignPAPPayContractEntrustMiniProgramRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -74,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "miniprogram-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -83,13 +80,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPAPPayContractEntrustH5Async(this WechatTenpayClient client, Models.PresignHKPAPPayContractEntrustH5Request request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPAPPayContractEntrustH5Async(this WechatTenpayGlobalClient client, Models.PresignPAPPayContractEntrustH5Request request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -97,7 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "h5-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -106,13 +102,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPAPPayContractEntrustWebAsync(this WechatTenpayClient client, Models.PresignHKPAPPayContractEntrustWebRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPAPPayContractEntrustWebAsync(this WechatTenpayGlobalClient client, Models.PresignPAPPayContractEntrustWebRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -120,7 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "web-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -129,13 +124,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPAPPayContractByOutContractCodeAsync(this WechatTenpayClient client, Models.GetHKPAPPayContractByOutContractCodeRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPAPPayContractByOutContractCodeAsync(this WechatTenpayGlobalClient client, Models.GetPAPPayContractByOutContractCodeRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -145,7 +139,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("appid", request.AppId)
.SetQueryParam("plan_id", request.PlanId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -154,13 +148,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPAPPayContractByContractIdAsync(this WechatTenpayClient client, Models.GetHKPAPPayContractByContractIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPAPPayContractByContractIdAsync(this WechatTenpayGlobalClient client, Models.GetPAPPayContractByContractIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -169,7 +162,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "papay", "contracts", request.ContractId)
.SetQueryParam("appid", request.AppId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -178,13 +171,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteTerminateHKPAPPayContractAsync(this WechatTenpayClient client, Models.TerminateHKPAPPayContractRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteTerminatePAPPayContractAsync(this WechatTenpayGlobalClient client, Models.TerminatePAPPayContractRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -192,7 +184,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", request.ContractId, "terminate");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -201,13 +193,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPAPPayTransactionAsync(this WechatTenpayClient client, Models.CreateHKPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePAPPayTransactionAsync(this WechatTenpayGlobalClient client, Models.CreatePAPPayTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -215,7 +206,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "transactions");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -224,13 +215,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPAPPayTransactionByOutTradeNumberAsync(this WechatTenpayClient client, Models.GetHKPAPPayTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPAPPayTransactionByOutTradeNumberAsync(this WechatTenpayGlobalClient client, Models.GetPAPPayTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -238,7 +228,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Get, "papay", "transactions", "out-trade-no", request.OutTradeNumber);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -247,13 +237,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPAPPayTransactionByIdAsync(this WechatTenpayClient client, Models.GetHKPAPPayTransactionByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPAPPayTransactionByIdAsync(this WechatTenpayGlobalClient client, Models.GetPAPPayTransactionByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -261,7 +250,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Get, "papay", "transactions", request.TransactionId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -270,13 +259,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteReverseHKPAPPayTransactionAsync(this WechatTenpayClient client, Models.ReverseHKPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteReversePAPPayTransactionAsync(this WechatTenpayGlobalClient client, Models.ReversePAPPayTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -284,7 +272,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "transactions", "out-trade-no", request.OutTradeNumber, "reverse");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerPAPPayExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerPAPPayExtensions.cs
similarity index 65%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerPAPPayExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerPAPPayExtensions.cs
index 117761fa..5e113a98 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerPAPPayExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerPAPPayExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKPartnerPAPPayExtensions
+ public static class WechatTenpayGlobalClientExecutePartnerPAPPayExtensions
{
///
/// 异步调用 [POST] /papay/contracts/app-pre-entrust-sign 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPartnerPAPPayContractEntrustAppAsync(this WechatTenpayClient client, Models.PresignHKPartnerPAPPayContractEntrustAppRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPartnerPAPPayContractEntrustAppAsync(this WechatTenpayGlobalClient client, Models.PresignPartnerPAPPayContractEntrustAppRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -28,7 +27,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "app-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -37,13 +36,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPartnerPAPPayContractEntrustJsapiAsync(this WechatTenpayClient client, Models.PresignHKPartnerPAPPayContractEntrustJsapiRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPartnerPAPPayContractEntrustJsapiAsync(this WechatTenpayGlobalClient client, Models.PresignPartnerPAPPayContractEntrustJsapiRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -51,7 +49,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "jsapi-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -60,13 +58,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPartnerPAPPayContractEntrustMiniProgramAsync(this WechatTenpayClient client, Models.PresignHKPartnerPAPPayContractEntrustMiniProgramRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPartnerPAPPayContractEntrustMiniProgramAsync(this WechatTenpayGlobalClient client, Models.PresignPartnerPAPPayContractEntrustMiniProgramRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -74,7 +71,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "miniprogram-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -83,13 +80,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPartnerPAPPayContractEntrustH5Async(this WechatTenpayClient client, Models.PresignHKPartnerPAPPayContractEntrustH5Request request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPartnerPAPPayContractEntrustH5Async(this WechatTenpayGlobalClient client, Models.PresignPartnerPAPPayContractEntrustH5Request request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -97,7 +93,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "h5-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -106,13 +102,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecutePresignHKPartnerPAPPayContractEntrustWebAsync(this WechatTenpayClient client, Models.PresignHKPartnerPAPPayContractEntrustWebRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecutePresignPartnerPAPPayContractEntrustWebAsync(this WechatTenpayGlobalClient client, Models.PresignPartnerPAPPayContractEntrustWebRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -120,7 +115,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", "web-pre-entrust-sign");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -129,13 +124,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerPAPPayContractByOutContractCodeAsync(this WechatTenpayClient client, Models.GetHKPartnerPAPPayContractByOutContractCodeRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerPAPPayContractByOutContractCodeAsync(this WechatTenpayGlobalClient client, Models.GetPartnerPAPPayContractByOutContractCodeRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -147,7 +141,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sub_appid", request.SubAppId)
.SetQueryParam("plan_id", request.PlanId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -156,13 +150,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerPAPPayContractByContractIdAsync(this WechatTenpayClient client, Models.GetHKPartnerPAPPayContractByContractIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerPAPPayContractByContractIdAsync(this WechatTenpayGlobalClient client, Models.GetPartnerPAPPayContractByContractIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -173,7 +166,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sub_mchid", request.SubMerchantId)
.SetQueryParam("sub_appid", request.SubAppId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -182,13 +175,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteTerminateHKPartnerPAPPayContractAsync(this WechatTenpayClient client, Models.TerminateHKPartnerPAPPayContractRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteTerminatePartnerPAPPayContractAsync(this WechatTenpayGlobalClient client, Models.TerminatePartnerPAPPayContractRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -196,7 +188,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "contracts", request.ContractId, "terminate");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -205,13 +197,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerPAPPayTransactionAsync(this WechatTenpayClient client, Models.CreateHKPartnerPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerPAPPayTransactionAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -219,7 +210,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "transactions");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -228,13 +219,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerPAPPayTransactionByOutTradeNumberAsync(this WechatTenpayClient client, Models.GetHKPartnerPAPPayTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerPAPPayTransactionByOutTradeNumberAsync(this WechatTenpayGlobalClient client, Models.GetPartnerPAPPayTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -243,7 +233,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "papay", "transactions", "out-trade-no", request.OutTradeNumber)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -252,13 +242,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerPAPPayTransactionByIdAsync(this WechatTenpayClient client, Models.GetHKPartnerPAPPayTransactionByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerPAPPayTransactionByIdAsync(this WechatTenpayGlobalClient client, Models.GetPartnerPAPPayTransactionByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -267,7 +256,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "papay", "transactions", request.TransactionId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -276,13 +265,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteReverseHKPartnerPAPPayTransactionAsync(this WechatTenpayClient client, Models.ReverseHKPartnerPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteReversePartnerPAPPayTransactionAsync(this WechatTenpayGlobalClient client, Models.ReversePartnerPAPPayTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -290,7 +278,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "papay", "transactions", "out-trade-no", request.OutTradeNumber, "reverse");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerRefundExtensions.cs
similarity index 77%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerRefundExtensions.cs
index 48c5839c..167bd008 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerRefundExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerRefundExtensions.cs
@@ -5,9 +5,9 @@ using System.Threading.Tasks;
using Flurl;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKPartnerRefundExtensions
+ public static class WechatTenpayGlobalClientExecutePartnerRefundExtensions
{
///
/// 异步调用 [POST] /refunds 接口。
@@ -21,13 +21,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerRefundAsync(this WechatTenpayClient client, Models.CreateHKPartnerRefundRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerRefundAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerRefundRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -38,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "refunds");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -53,13 +52,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerRefundByOutRefundNumberAsync(this WechatTenpayClient client, Models.GetHKPartnerRefundByOutRefundNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerRefundByOutRefundNumberAsync(this WechatTenpayGlobalClient client, Models.GetPartnerRefundByOutRefundNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -72,7 +70,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -87,13 +85,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerRefundByIdAsync(this WechatTenpayClient client, Models.GetHKPartnerRefundByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerRefundByIdAsync(this WechatTenpayGlobalClient client, Models.GetPartnerRefundByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -106,7 +103,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -121,13 +118,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteQueryHKPartnerRefundsAsync(this WechatTenpayClient client, Models.QueryHKPartnerRefundsRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteQueryPartnerRefundsAsync(this WechatTenpayGlobalClient client, Models.QueryPartnerRefundsRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -144,7 +140,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("offset", request.Offset)
.SetQueryParam("count", request.Limit);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs
similarity index 74%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs
index 00236b1c..ed5ee24d 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKPartnerTransactionsExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecutePartnerTransactionsExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKPartnerTransactionsExtensions
+ public static class WechatTenpayGlobalClientExecutePartnerTransactionsExtensions
{
///
/// 异步调用 [POST] /transactions/app 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerTransactionAppAsync(this WechatTenpayClient client, Models.CreateHKPartnerTransactionAppRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerTransactionAppAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerTransactionAppRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -31,7 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "app");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -40,13 +39,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerTransactionMWebAsync(this WechatTenpayClient client, Models.CreateHKPartnerTransactionMWebRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerTransactionMWebAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerTransactionMWebRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -57,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "mweb");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -67,13 +65,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerTransactionJsapiAsync(this WechatTenpayClient client, Models.CreateHKPartnerTransactionJsapiRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerTransactionJsapiAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerTransactionJsapiRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -84,7 +81,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "jsapi");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -93,13 +90,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerTransactionNativeAsync(this WechatTenpayClient client, Models.CreateHKPartnerTransactionNativeRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerTransactionNativeAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerTransactionNativeRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -110,7 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "native");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -119,13 +115,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKPartnerTransactionMicroPayAsync(this WechatTenpayClient client, Models.CreateHKPartnerTransactionMicroPayRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreatePartnerTransactionMicroPayAsync(this WechatTenpayGlobalClient client, Models.CreatePartnerTransactionMicroPayRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -136,7 +131,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "micropay", "transactions", "pay");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -150,13 +145,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerTransactionByOutTradeNumberAsync(this WechatTenpayClient client, Models.GetHKPartnerTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerTransactionByOutTradeNumberAsync(this WechatTenpayGlobalClient client, Models.GetPartnerTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -169,7 +163,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -183,13 +177,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKPartnerTransactionByIdAsync(this WechatTenpayClient client, Models.GetHKPartnerTransactionByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetPartnerTransactionByIdAsync(this WechatTenpayGlobalClient client, Models.GetPartnerTransactionByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -202,7 +195,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -215,13 +208,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCloseHKPartnerTransactionAsync(this WechatTenpayClient client, Models.CloseHKPartnerTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteClosePartnerTransactionAsync(this WechatTenpayGlobalClient client, Models.ClosePartnerTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -232,7 +224,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "close");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -241,13 +233,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteReverseHKPartnerTransactionAsync(this WechatTenpayClient client, Models.ReverseHKPartnerTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteReversePartnerTransactionAsync(this WechatTenpayGlobalClient client, Models.ReversePartnerTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -260,7 +251,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("sp_mchid", request.MerchantId)
.SetQueryParam("sub_mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -274,13 +265,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteDownloadHKStatementsAsync(this WechatTenpayClient client, Models.DownloadHKStatementsRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteDownloadStatementsAsync(this WechatTenpayGlobalClient client, Models.DownloadStatementsRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -292,7 +282,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (request.SubMerchantId is not null)
flurlReq.SetQueryParam("mchid", request.SubMerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -306,13 +296,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteQueryHKSettlementsAsync(this WechatTenpayClient client, Models.QueryHKSettlementsRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteQuerySettlementsAsync(this WechatTenpayGlobalClient client, Models.QuerySettlementsRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -332,7 +321,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
if (request.EndDateString is not null)
flurlReq.SetQueryParam("settle_end_date", request.EndDateString);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteRefundExtensions.cs
similarity index 77%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteRefundExtensions.cs
index 79ef0386..8933c592 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKRefundExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteRefundExtensions.cs
@@ -5,9 +5,9 @@ using System.Threading.Tasks;
using Flurl;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKRefundExtensions
+ public static class WechatTenpayGlobalClientExecuteRefundExtensions
{
///
/// 异步调用 [POST] /refunds 接口。
@@ -21,13 +21,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKRefundAsync(this WechatTenpayClient client, Models.CreateHKRefundRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateRefundAsync(this WechatTenpayGlobalClient client, Models.CreateRefundRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -38,7 +37,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "refunds");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -53,13 +52,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKRefundByOutRefundNumberAsync(this WechatTenpayClient client, Models.GetHKRefundByOutRefundNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetRefundByOutRefundNumberAsync(this WechatTenpayGlobalClient client, Models.GetRefundByOutRefundNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -71,7 +69,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "refunds", "out-refund-no", request.OutRefundNumber)
.SetQueryParam("mchid", request.MerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -86,13 +84,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKRefundByIdAsync(this WechatTenpayClient client, Models.GetHKRefundByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetRefundByIdAsync(this WechatTenpayGlobalClient client, Models.GetRefundByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -104,7 +101,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "refunds", "id", request.RefundId)
.SetQueryParam("mchid", request.MerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -119,13 +116,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteQueryHKRefundsAsync(this WechatTenpayClient client, Models.QueryHKRefundsRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteQueryRefundsAsync(this WechatTenpayGlobalClient client, Models.QueryRefundsRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -141,7 +137,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.SetQueryParam("offset", request.Offset)
.SetQueryParam("count", request.Limit);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteTransactionsExtensions.cs
similarity index 72%
rename from src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs
rename to src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteTransactionsExtensions.cs
index fecd1968..a1906cf9 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteHKTransactionsExtensions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientExecuteTransactionsExtensions.cs
@@ -4,9 +4,9 @@ using System.Threading;
using System.Threading.Tasks;
using Flurl.Http;
-namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.ExtendedSDK.Global
{
- public static class WechatTenpayClientExecuteHKTransactionsExtensions
+ public static class WechatTenpayGlobalClientExecuteTransactionsExtensions
{
///
/// 异步调用 [POST] /transactions/app 接口。
@@ -14,13 +14,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKTransactionAppAsync(this WechatTenpayClient client, Models.CreateHKTransactionAppRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateTransactionAppAsync(this WechatTenpayGlobalClient client, Models.CreateTransactionAppRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -31,7 +30,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "app");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -40,13 +39,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKTransactionMWebAsync(this WechatTenpayClient client, Models.CreateHKTransactionMWebRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateTransactionMWebAsync(this WechatTenpayGlobalClient client, Models.CreateTransactionMWebRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -57,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "mweb");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -67,13 +65,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKTransactionJsapiAsync(this WechatTenpayClient client, Models.CreateHKTransactionJsapiRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateTransactionJsapiAsync(this WechatTenpayGlobalClient client, Models.CreateTransactionJsapiRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -84,7 +81,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "jsapi");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -93,13 +90,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKTransactionNativeAsync(this WechatTenpayClient client, Models.CreateHKTransactionNativeRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateTransactionNativeAsync(this WechatTenpayGlobalClient client, Models.CreateTransactionNativeRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -110,7 +106,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "native");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -119,13 +115,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCreateHKTransactionMicroPayAsync(this WechatTenpayClient client, Models.CreateHKTransactionMicroPayRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCreateTransactionMicroPayAsync(this WechatTenpayGlobalClient client, Models.CreateTransactionMicroPayRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -136,7 +131,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "micropay", "transactions", "pay");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -150,13 +145,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKTransactionByOutTradeNumberAsync(this WechatTenpayClient client, Models.GetHKTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetTransactionByOutTradeNumberAsync(this WechatTenpayGlobalClient client, Models.GetTransactionByOutTradeNumberRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -168,7 +162,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "out-trade-no", request.OutTradeNumber)
.SetQueryParam("mchid", request.MerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -182,13 +176,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteGetHKTransactionByIdAsync(this WechatTenpayClient client, Models.GetHKTransactionByIdRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteGetTransactionByIdAsync(this WechatTenpayGlobalClient client, Models.GetTransactionByIdRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -200,7 +193,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Get, "transactions", "id", request.TransactionId)
.SetQueryParam("mchid", request.MerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -213,13 +206,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
///
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteCloseHKTransactionAsync(this WechatTenpayClient client, Models.CloseHKTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteCloseTransactionAsync(this WechatTenpayGlobalClient client, Models.CloseTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -230,7 +222,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
IFlurlRequest flurlReq = client
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "close");
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
///
@@ -239,13 +231,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
/// REF:
///
///
- /// (请注意此接口专为境外支付设计,调用时需在构造 时指定单独的 。)
///
///
///
///
///
- public static async Task ExecuteReverseHKTransactionAsync(this WechatTenpayClient client, Models.ReverseHKTransactionRequest request, CancellationToken cancellationToken = default)
+ public static async Task ExecuteReverseTransactionAsync(this WechatTenpayGlobalClient client, Models.ReverseTransactionRequest request, CancellationToken cancellationToken = default)
{
if (client is null) throw new ArgumentNullException(nameof(client));
if (request is null) throw new ArgumentNullException(nameof(request));
@@ -257,7 +248,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
.CreateFlurlRequest(request, HttpMethod.Post, "transactions", "out-trade-no", request.OutTradeNumber, "reverse")
.SetQueryParam("mchid", request.MerchantId);
- return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
+ return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false);
}
}
}
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientParameterExtensions.cs
new file mode 100644
index 00000000..e0b3e3a9
--- /dev/null
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/ExtendedSDK/Global/Extensions/WechatTenpayGlobalClientParameterExtensions.cs
@@ -0,0 +1,57 @@
+using System.Collections.Generic;
+
+namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
+{
+ public static class WechatTenpayGlobalClientParameterExtensions
+ {
+ ///
+ /// 生成客户端 JSAPI / 小程序调起支付所需的参数字典。
+ ///
+ /// REF:
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public static IDictionary GenerateParametersForJsapiPayRequest(this WechatTenpayClient client, string appId, string prepayId)
+ {
+ return WechatTenpayClientParameterExtensions.GenerateParametersForJsapiPayRequest(client, appId, prepayId);
+ }
+
+ ///
+ /// 生成 APP 调起支付所需的参数字典。
+ ///
+ /// REF: