From 8aae308a27b820931065fd8a325d60d36c6326eb Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 14 Jul 2025 20:39:03 +0800 Subject: [PATCH] =?UTF-8?q?feat(tenpayv3):=20=E6=96=B0=E5=A2=9E=E8=BF=98?= =?UTF-8?q?=E6=AC=BE=E6=94=AF=E4=BB=98=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/WechatTenpayV3/Basic_ModelDefinition.md | 3 +- .../CombineTransactionResource.cs | 2 +- ...ClientExecuteRepaymentPartnerExtensions.cs | 89 +++++++++ .../WechatTenpayClientParameterExtensions.cs | 9 +- .../CreateCombineTransactionAppRequest.cs | 2 +- .../CreateCombineTransactionH5Request.cs | 39 +--- ...nsactionByCombineOutTradeNumberResponse.cs | 2 +- .../CreatePayTransactionH5Request.cs | 4 +- ...nsactionByCombineOutTradeNumberResponse.cs | 2 +- ...paymentPartnerCombineTransactionRequest.cs | 51 +++++ ...aymentPartnerCombineTransactionResponse.cs | 9 + ...paymentPartnerCombineTransactionRequest.cs | 179 ++++++++++++++++++ ...aymentPartnerCombineTransactionResponse.cs | 22 +++ ...mbineTransactionByOutTradeNumberRequest.cs | 15 ++ ...bineTransactionByOutTradeNumberResponse.cs | 141 ++++++++++++++ ...ymentPartnerCombineTransactionRequest.json | 9 + ...ymentPartnerCombineTransactionRequest.json | 39 ++++ ...mentPartnerCombineTransactionResponse.json | 4 + ...neTransactionByOutTradeNumberResponse.json | 28 +++ 19 files changed, 602 insertions(+), 47 deletions(-) create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRepaymentPartnerExtensions.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionResponse.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest.cs create mode 100644 src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.cs create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.json create mode 100644 test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.json diff --git a/docs/WechatTenpayV3/Basic_ModelDefinition.md b/docs/WechatTenpayV3/Basic_ModelDefinition.md index c431a5c9..05b32871 100644 --- a/docs/WechatTenpayV3/Basic_ModelDefinition.md +++ b/docs/WechatTenpayV3/Basic_ModelDefinition.md @@ -48,7 +48,8 @@ | √ | 经营能力：微信支付分签约计划 | 直连商户 & 合作伙伴 | | | √ | 经营能力：平台收付通 | 合作伙伴 | | | √ | 经营能力：平台保证金 | 合作伙伴 | | -| √ | 经营能力：个人收款（二手交易） | 合作伙伴 | | +| √ | 经营能力：个人收款 | 合作伙伴 | | +| √ | 经营能力：还款支付 | 合作伙伴 | | | √ | 运营工具：代金券 | 直连商户 & 合作伙伴 | | | √ | 运营工具：商家券 | 直连商户 & 合作伙伴 | | | √ | 运营工具：消费金 | 直连商户 | | diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/CombineTransactions/CombineTransactionResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/CombineTransactions/CombineTransactionResource.cs index 12848bef..7d7569de 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/CombineTransactions/CombineTransactionResource.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/CombineTransactions/CombineTransactionResource.cs @@ -59,7 +59,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events /// [Newtonsoft.Json.JsonProperty("sub_orders")] [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] - public Types.SubOrder[]? SubOrderList { get; set; } = default!; + public Types.SubOrder[]? SubOrderList { get; set; } /// /// 获取或设置支付者信息。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRepaymentPartnerExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRepaymentPartnerExtensions.cs new file mode 100644 index 00000000..6c14736e --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteRepaymentPartnerExtensions.cs @@ -0,0 +1,89 @@ +using System; +using System.Net.Http; +using System.Threading; +using System.Threading.Tasks; +using Flurl.Http; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 +{ + public static class WechatTenpayClientExecuteRepaymentPartnerExtensions + { + /// + /// 异步调用 [POST] /repayment/combine-transactions/partner/prepay 接口。 + /// + /// REF:
+ /// + /// + /// + /// + /// + /// + /// + public static async Task ExecuteCreateRepaymentPartnerCombineTransactionAsync(this WechatTenpayClient client, Models.CreateRepaymentPartnerCombineTransactionRequest request, CancellationToken cancellationToken = default) + { + if (client is null) throw new ArgumentNullException(nameof(client)); + if (request is null) throw new ArgumentNullException(nameof(request)); + + if (request.CombineMerchantId is null) + request.CombineMerchantId = client.Credentials.MerchantId; + + if (request.SubOrderList is not null) + { + foreach (var subOrder in request.SubOrderList) + { + if (subOrder.MerchantId is null) + subOrder.MerchantId = request.CombineMerchantId; + } + } + + IFlurlRequest flurlReq = client + .CreateFlurlRequest(request, HttpMethod.Post, "repayment", "combine-transactions", "partner", "prepay"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [GET] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no} 接口。 + /// + /// REF:
+ /// + /// + /// + /// + /// + /// + /// + public static async Task ExecuteGetRepaymentPartnerCombineTransactionByOutTradeNumberAsync(this WechatTenpayClient client, Models.GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest 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, "repayment", "combine-transactions", "partner", "out-trade-no", request.CombineOutTradeNumber); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [POST] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no}/close 接口。 + /// + /// REF:
+ /// + /// + /// + /// + /// + /// + /// + public static async Task ExecuteCloseRepaymentPartnerCombineTransactionAsync(this WechatTenpayClient client, Models.CloseRepaymentPartnerCombineTransactionRequest 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.Post, "repayment", "combine-transactions", "partner", "out-trade-no", request.CombineOutTradeNumber, "close"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientParameterExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientParameterExtensions.cs index fa84b70b..00e511e8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientParameterExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientParameterExtensions.cs @@ -23,7 +23,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 ///
///
///
- /// + ///
+ /// /// /// /// @@ -64,7 +65,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 ///
///
///
- /// + ///
+ /// /// /// /// @@ -85,7 +87,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 ///
///
///
- /// + ///
+ /// /// /// /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionAppRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionAppRequest.cs index c9ffd94f..e8266e87 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionAppRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionAppRequest.cs @@ -45,7 +45,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("subsidy_amount")] [System.Text.Json.Serialization.JsonPropertyName("subsidy_amount")] - public long? SubsidyAmount { get; set; } + public int? SubsidyAmount { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs index 81804b9e..7be30af6 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/CreateCombineTransactionH5Request.cs @@ -18,43 +18,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { public static class Types { - public class H5 + public class H5Info : CreatePayTransactionH5Request.Types.Scene.Types.H5Info { - /// - /// 获取或设置场景类型。 - /// 默认值："Wap" - /// - [Newtonsoft.Json.JsonProperty("type")] - [System.Text.Json.Serialization.JsonPropertyName("type")] - public string Type { get; set; } = "Wap"; - - /// - /// 获取或设置应用名称。 - /// - [Newtonsoft.Json.JsonProperty("app_name")] - [System.Text.Json.Serialization.JsonPropertyName("app_name")] - public string? AppName { get; set; } - - /// - /// 获取或设置网站 URL。 - /// - [Newtonsoft.Json.JsonProperty("app_url")] - [System.Text.Json.Serialization.JsonPropertyName("app_url")] - public string? AppUrl { get; set; } - - /// - /// 获取或设置 iOS 平台 BundleID。 - /// - [Newtonsoft.Json.JsonProperty("bundle_id")] - [System.Text.Json.Serialization.JsonPropertyName("bundle_id")] - public string? BundleId { get; set; } - - /// - /// 获取或设置 Android 平台 PackageName。 - /// - [Newtonsoft.Json.JsonProperty("package_name")] - [System.Text.Json.Serialization.JsonPropertyName("package_name")] - public string? PackageName { get; set; } } } @@ -63,7 +28,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("h5_info")] [System.Text.Json.Serialization.JsonPropertyName("h5_info")] - public Types.H5 H5 { get; set; } = new Types.H5(); + public Types.H5Info H5Info { get; set; } = new Types.H5Info(); } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs index 229aa28d..13d8a3c8 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs @@ -207,7 +207,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("sub_orders")] [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] - public Types.SubOrder[]? SubOrderList { get; set; } = default!; + public Types.SubOrder[]? SubOrderList { get; set; } /// /// 获取或设置支付者信息。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs index 881ccc00..e0f9d82e 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/PayTransactions/CreatePayTransactionH5Request.cs @@ -21,7 +21,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { public static new class Types { - public class H5 + public class H5Info { /// /// 获取或设置场景类型。 @@ -66,7 +66,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("h5_info")] [System.Text.Json.Serialization.JsonPropertyName("h5_info")] - public Types.H5 H5 { get; set; } = new Types.H5(); + public Types.H5Info H5Info { get; set; } = new Types.H5Info(); } public class Settlement : CreatePayTransactionAppRequest.Types.Settlement diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/CombinePAPay/GetEcommerceCombinePAPayTransactionByCombineOutTradeNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/CombinePAPay/GetEcommerceCombinePAPayTransactionByCombineOutTradeNumberResponse.cs index cd5f1f3d..9b448c68 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/CombinePAPay/GetEcommerceCombinePAPayTransactionByCombineOutTradeNumberResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Ecommerce/CombinePAPay/GetEcommerceCombinePAPayTransactionByCombineOutTradeNumberResponse.cs @@ -55,7 +55,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models /// [Newtonsoft.Json.JsonProperty("sub_orders")] [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] - public Types.SubOrder[]? SubOrderList { get; set; } = default!; + public Types.SubOrder[]? SubOrderList { get; set; } /// /// 获取或设置支付者信息。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.cs new file mode 100644 index 00000000..3a3f7062 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.cs @@ -0,0 +1,51 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no}/close 接口的请求。 + /// + public class CloseRepaymentPartnerCombineTransactionRequest : WechatTenpayRequest + { + public static class Types + { + public class SubOrder + { + /// + /// 获取或设置子单微信商户号。如果不指定将使用还款单微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string? MerchantId { get; set; } + + /// + /// 获取或设置子单子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置子单商户订单号。 + /// + [Newtonsoft.Json.JsonProperty("out_trade_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_trade_no")] + public string OutTradeNumber { get; set; } = string.Empty; + } + } + + /// + /// 获取或设置还款单商户订单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string CombineOutTradeNumber { get; set; } = string.Empty; + + /// + /// 获取或设置子单列表。 + /// + [Newtonsoft.Json.JsonProperty("sub_orders")] + [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] + public IList SubOrderList { get; set; } = new List(); + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionResponse.cs new file mode 100644 index 00000000..3ab3803f --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionResponse.cs @@ -0,0 +1,9 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no}/close 接口的响应。 + /// + public class CloseRepaymentPartnerCombineTransactionResponse : WechatTenpayResponse + { + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.cs new file mode 100644 index 00000000..59370cdc --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.cs @@ -0,0 +1,179 @@ +using System; +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /repayment/combine-transactions/partner/prepay 接口的请求。 + /// + public class CreateRepaymentPartnerCombineTransactionRequest : WechatTenpayRequest + { + public static class Types + { + public class SubOrder + { + public static class Types + { + public class Amount : CreateCombineTransactionAppRequest.Types.SubOrder.Types.Amount + { + } + + public class Settlement : CreateCombineTransactionAppRequest.Types.SubOrder.Types.Settlement + { + } + } + + /// + /// 获取或设置子单微信商户号。如果不指定将使用还款单微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string? MerchantId { get; set; } + + /// + /// 获取或设置子单子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置附加数据。 + /// + [Newtonsoft.Json.JsonProperty("attach")] + [System.Text.Json.Serialization.JsonPropertyName("attach")] + public string? Attachment { get; set; } + + /// + /// 获取或设置商品描述。 + /// + [Newtonsoft.Json.JsonProperty("description")] + [System.Text.Json.Serialization.JsonPropertyName("description")] + public string Description { get; set; } = string.Empty; + + /// + /// 获取或设置子单商户订单号。 + /// + [Newtonsoft.Json.JsonProperty("out_trade_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_trade_no")] + public string OutTradeNumber { get; set; } = string.Empty; + + /// + /// 获取或设置金额信息。 + /// + [Newtonsoft.Json.JsonProperty("amount")] + [System.Text.Json.Serialization.JsonPropertyName("amount")] + public Types.Amount Amount { get; set; } = new Types.Amount(); + + /// + /// 获取或设置结算信息。 + /// + [Newtonsoft.Json.JsonProperty("settle_info")] + [System.Text.Json.Serialization.JsonPropertyName("settle_info")] + public Types.Settlement? Settlement { get; set; } + } + + public class AppInfo + { + /// + /// 获取或设置还款商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("combine_appid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_appid")] + public string CombineAppId { get; set; } = string.Empty; + } + + public class H5Info : CreateCombineTransactionH5Request.Types.Scene.Types.H5Info + { + /// + /// 获取或设置还款商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("combine_appid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_appid")] + public string CombineAppId { get; set; } = string.Empty; + + /// + /// 获取或设置用户终端 IP。 + /// + [Newtonsoft.Json.JsonProperty("payer_client_ip")] + [System.Text.Json.Serialization.JsonPropertyName("payer_client_ip")] + public string ClientIp { get; set; } = string.Empty; + } + + public class MiniProgramInfo + { + /// + /// 获取或设置还款商户 AppId。 + /// + [Newtonsoft.Json.JsonProperty("combine_appid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_appid")] + public string CombineAppId { get; set; } = string.Empty; + + /// + /// 获取或设置用户 OpenId。 + /// + [Newtonsoft.Json.JsonProperty("openid")] + [System.Text.Json.Serialization.JsonPropertyName("openid")] + public string OpenId { get; set; } = string.Empty; + } + } + + /// + /// 获取或设置还款单发起方的微信商户号。如果不指定将使用构造 时的 参数。 + /// + [Newtonsoft.Json.JsonProperty("combine_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_mchid")] + public string? CombineMerchantId { get; set; } + + /// + /// 获取或设置还款商户订单号。 + /// + [Newtonsoft.Json.JsonProperty("combine_out_trade_no")] + [System.Text.Json.Serialization.JsonPropertyName("combine_out_trade_no")] + public string CombineOutTradeNumber { get; set; } = string.Empty; + + /// + /// 获取或设置交易结束时间。 + /// + [Newtonsoft.Json.JsonProperty("time_expire")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("time_expire")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset? ExpireTime { get; set; } + + /// + /// 获取或设置回调通知地址。 + /// + [Newtonsoft.Json.JsonProperty("notify_url")] + [System.Text.Json.Serialization.JsonPropertyName("notify_url")] + public string? NotifyUrl { get; set; } + + /// + /// 获取或设置子单列表。 + /// + [Newtonsoft.Json.JsonProperty("sub_orders")] + [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] + public IList SubOrderList { get; set; } = new List(); + + /// + /// 获取或设置 App 支付场景信息。 + /// + [Newtonsoft.Json.JsonProperty("app_info")] + [System.Text.Json.Serialization.JsonPropertyName("app_info")] + public Types.AppInfo? AppInfo { get; set; } + + /// + /// 获取或设置 H5 支付场景信息。 + /// + [Newtonsoft.Json.JsonProperty("h5_info")] + [System.Text.Json.Serialization.JsonPropertyName("h5_info")] + public Types.H5Info? H5Info { get; set; } + + /// + /// 获取或设置小程序支付场景信息。 + /// + [Newtonsoft.Json.JsonProperty("miniprogram_info")] + [System.Text.Json.Serialization.JsonPropertyName("miniprogram_info")] + public Types.MiniProgramInfo? MiniProgramInfo { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.cs new file mode 100644 index 00000000..58dc328d --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.cs @@ -0,0 +1,22 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /repayment/combine-transactions/partner/prepay 接口的响应。 + /// + public class CreateRepaymentPartnerCombineTransactionResponse : WechatTenpayResponse + { + /// + /// 获取或设置预支付交易会话标识。 + /// + [Newtonsoft.Json.JsonProperty("prepay_id")] + [System.Text.Json.Serialization.JsonPropertyName("prepay_id")] + public string? PrepayId { get; set; } + + /// + /// 获取或设置支付跳转链接。 + /// + [Newtonsoft.Json.JsonProperty("h5_url")] + [System.Text.Json.Serialization.JsonPropertyName("h5_url")] + public string? H5Url { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest.cs new file mode 100644 index 00000000..3350d4bd --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no} 接口的请求。 + /// + public class GetRepaymentPartnerCombineTransactionByOutTradeNumberRequest : WechatTenpayRequest + { + /// + /// 获取或设置还款商户订单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string CombineOutTradeNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.cs new file mode 100644 index 00000000..e21f193b --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.cs @@ -0,0 +1,141 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /repayment/combine-transactions/partner/out-trade-no/{combine_out_trade_no} 接口的响应。 + /// + public class GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse : WechatTenpayResponse + { + public static class Types + { + public class SubOrder + { + public static class Types + { + public class Amount : GetCombineTransactionByCombineOutTradeNumberResponse.Types.SubOrder.Types.Amount + { + } + } + + /// + /// 获取或设置子单微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string MerchantId { get; set; } = default!; + + /// + /// 获取或设置子单子商户号。 + /// + [Newtonsoft.Json.JsonProperty("sub_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sub_mchid")] + public string? SubMerchantId { get; set; } + + /// + /// 获取或设置子单商户订单号。 + /// + [Newtonsoft.Json.JsonProperty("out_trade_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_trade_no")] + public string OutTradeNumber { get; set; } = default!; + + /// + /// 获取或设置子单微信订单号。 + /// + [Newtonsoft.Json.JsonProperty("transaction_id")] + [System.Text.Json.Serialization.JsonPropertyName("transaction_id")] + public string TransactionId { get; set; } = default!; + + /// + /// 获取或设置交易类型。 + /// + [Newtonsoft.Json.JsonProperty("trade_type")] + [System.Text.Json.Serialization.JsonPropertyName("trade_type")] + public string TradeType { get; set; } = default!; + + /// + /// 获取或设置交易状态。 + /// + [Newtonsoft.Json.JsonProperty("trade_state")] + [System.Text.Json.Serialization.JsonPropertyName("trade_state")] + public string TradeState { get; set; } = default!; + + /// + /// 获取或设置付款银行类型。 + /// + [Newtonsoft.Json.JsonProperty("bank_type")] + [System.Text.Json.Serialization.JsonPropertyName("bank_type")] + public string? BankType { get; set; } + + /// + /// 获取或设置附加数据。 + /// + [Newtonsoft.Json.JsonProperty("attach")] + [System.Text.Json.Serialization.JsonPropertyName("attach")] + public string Attachment { get; set; } = default!; + + /// + /// 获取或设置支付完成时间。 + /// + [Newtonsoft.Json.JsonProperty("success_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("success_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset? SuccessTime { get; set; } + + /// + /// 获取或设置金额信息。 + /// + [Newtonsoft.Json.JsonProperty("amount")] + [System.Text.Json.Serialization.JsonPropertyName("amount")] + public Types.Amount Amount { get; set; } = default!; + } + + public class Payer : GetCombineTransactionByCombineOutTradeNumberResponse.Types.Payer + { + } + } + + /// + /// 获取或设置还款单发起方的微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("combine_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_mchid")] + public string CombineMerchantId { get; set; } = default!; + + /// + /// 获取或设置还款服务商 AppId。 + /// + [Newtonsoft.Json.JsonProperty("combine_appid")] + [System.Text.Json.Serialization.JsonPropertyName("combine_appid")] + public string CombineAppId { get; set; } = default!; + + /// + /// 获取或设置还款商户订单号。 + /// + [Newtonsoft.Json.JsonProperty("combine_out_trade_no")] + [System.Text.Json.Serialization.JsonPropertyName("combine_out_trade_no")] + public string CombineOutTradeNumber { get; set; } = default!; + + /// + /// 获取或设置微信支付订单号。 + /// + [Newtonsoft.Json.JsonProperty("combine_transaction_id")] + [System.Text.Json.Serialization.JsonPropertyName("combine_transaction_id")] + public string CombineTransactionId { get; set; } = default!; + + /// + /// 获取或设置子单列表。 + /// + [Newtonsoft.Json.JsonProperty("sub_orders")] + [System.Text.Json.Serialization.JsonPropertyName("sub_orders")] + public Types.SubOrder[]? SubOrderList { get; set; } + + /// + /// 获取或设置支付者信息。 + /// + [Newtonsoft.Json.JsonProperty("combine_payer_info")] + [System.Text.Json.Serialization.JsonPropertyName("combine_payer_info")] + public Types.Payer? CombinePayer { get; set; } + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.json new file mode 100644 index 00000000..e4ab7912 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CloseRepaymentPartnerCombineTransactionRequest.json @@ -0,0 +1,9 @@ +{ + "sub_orders": [ + { + "mchid": "1900000109", + "out_trade_no": "20150806125346", + "sub_mchid": "1230000109" + } + ] +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.json new file mode 100644 index 00000000..b8713ceb --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionRequest.json @@ -0,0 +1,39 @@ +{ + "combine_out_trade_no": "1217752501201407033233368018", + "combine_mchid": "1230000109", + "sub_orders": [ + { + "mchid": "1230000109", + "sub_mchid": "1900000109", + "out_trade_no": "20150806125346", + "amount": { + "total_amount": 10, + "currency": "CNY" + }, + "attach": "深圳分店", + "description": "某某放心借", + "settle_info": { + "profit_sharing": false, + "subsidy_amount": 10 + } + } + ], + "time_expire": "2018-06-08T10:34:56+08:00", + "notify_url": "https://yourapp.com/notify", + "h5_info": { + "combine_appid": "wxd678efh567hg6787", + "payer_client_ip": "14.23.150.211", + "type": "iOS", + "app_name": "王者荣耀", + "app_url": "https://pay.qq.com", + "bundle_id": "com.tencent.wzryiOS", + "package_name": "com.tencent.tmgp.sgame" + }, + "app_info": { + "combine_appid": "wxd678efh567hg6787" + }, + "miniprogram_info": { + "combine_appid": "wxd678efh567hg6787", + "openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o\t" + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.json new file mode 100644 index 00000000..df871852 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/CreateRepaymentPartnerCombineTransactionResponse.json @@ -0,0 +1,4 @@ +{ + "prepay_id": "wx201410272009395522657a690389285100", + "h5_url": "https://wx.tenpay.com/cgi-bin/mmpayweb-bin/checkmweb?prepay_id=wx2016121516420242444321ca0631331346&package=1405458241" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.json new file mode 100644 index 00000000..2abbb453 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/_Partner/Repayment/GetRepaymentPartnerCombineTransactionByOutTradeNumberResponse.json @@ -0,0 +1,28 @@ +{ + "combine_appid": "wxd678efh567hg6787", + "combine_mchid": "1230000109", + "combine_out_trade_no": "P20150806125346", + "combine_transaction_id": "1217752501201407033233368018", + "combine_payer_info": { + "openid": "oUpF8uMuAJO_M2pxb1Q9zNjWeS6o\t" + }, + "sub_orders": [ + { + "mchid": "1900000109", + "sub_mchid": "1230000109", + "out_trade_no": "20150806125346", + "transaction_id": "1009660380201506130728806387", + "trade_type": "JSAPI", + "trade_state": "SUCCESS", + "bank_type": "CMC", + "attach": "深圳分店", + "success_time": "2015-05-20T13:29:35.120+08:00", + "amount": { + "total_amount": 10, + "payer_amount": 10, + "currency": "CNY", + "payer_currency": "CNY" + } + } + ] +}