diff --git a/docs/WechatTenpayV3/Basic_ModelDefinition.md b/docs/WechatTenpayV3/Basic_ModelDefinition.md index e72b941f..d1222619 100644 --- a/docs/WechatTenpayV3/Basic_ModelDefinition.md +++ b/docs/WechatTenpayV3/Basic_ModelDefinition.md @@ -200,6 +200,12 @@ - 微信单号查询转账单:`GetFundAppMerchantTransferBillByTransferBillNumber` + - 发起转账并完成免确认收款授权:`CreateFundAppMerchantTransferBillPreTransferWithAuthorization` + + - 转账(用户免确认收款):`CreateFundAppMerchantTransferBillTransfer` + + - 商户单号查询免确认收款授权:`GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumber` + - 获取电子回单 - 商户单号申请电子回单:`CreateFundAppMerchantTransferElecsignByOutBillNumber` diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.cs new file mode 100644 index 00000000..8d7956dc --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.cs @@ -0,0 +1,72 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events +{ + /// + /// 表示 MCHTRANSFER.AUTHORIZATION.CONFIRMED 通知的数据。 + /// + /// REF:
+ ///
+ ///
+ ///
+ public class MerchantTransferAuthorizationConfirmedResource : WechatTenpayEvent.Types.IDecryptedResource + { + /// + /// 获取或设置微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string MerchantId { get; set; } = default!; + + /// + /// 获取或设置微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = default!; + + /// + /// 获取或设置商户侧授权单号。 + /// + [Newtonsoft.Json.JsonProperty("out_authorization_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")] + public string OutAuthorizationNumber { get; set; } = default!; + + /// + /// 获取或设置微信免确认收款授权单号。 + /// + [Newtonsoft.Json.JsonProperty("authorization_id")] + [System.Text.Json.Serialization.JsonPropertyName("authorization_id")] + public string AuthorizationId { get; set; } = default!; + + /// + /// 获取或设置授权状态。 + /// + [Newtonsoft.Json.JsonProperty("state")] + [System.Text.Json.Serialization.JsonPropertyName("state")] + public string State { get; set; } = default!; + + /// + /// 获取或设置收款用户 OpenId。 + /// + [Newtonsoft.Json.JsonProperty("openid")] + [System.Text.Json.Serialization.JsonPropertyName("openid")] + public string OpenId { get; set; } = default!; + + /// + /// 获取或设置用户展示昵称。 + /// + [Newtonsoft.Json.JsonProperty("user_display_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_display_name")] + public string UserDisplayName { get; set; } = default!; + + /// + /// 获取或设置用户确认授权的时间。 + /// + [Newtonsoft.Json.JsonProperty("authorize_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("authorize_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset AuthorizeTime { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs index 006ef729..02aa2f9b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs @@ -19,7 +19,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events public string MerchantId { get; set; } = default!; /// - /// 获取或设置商户转账单号 + /// 获取或设置商户转账单号。 /// [Newtonsoft.Json.JsonProperty("out_bill_no")] [System.Text.Json.Serialization.JsonPropertyName("out_bill_no")] diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs index 07302931..0e5e2b6b 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs @@ -188,6 +188,72 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } + + /// + /// 异步调用 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteCreateFundAppMerchantTransferBillPreTransferWithAuthorizationAsync(this WechatTenpayClient client, Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest 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, "fund-app", "mch-transfer", "transfer-bills", "pre-transfer-with-authorization"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [POST] /fund-app/mch-transfer/transfer-bills/transfer 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteCreateFundAppMerchantTransferBillTransferAsync(this WechatTenpayClient client, Models.CreateFundAppMerchantTransferBillTransferRequest 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, "fund-app", "mch-transfer", "transfer-bills", "transfer"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [GET] /fund-app/mch-transfer/user-confirm-authorization/out-authorization-no/{out_authorization_no} 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteGetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberAsync(this WechatTenpayClient client, Models.GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest 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, "fund-app", "mch-transfer", "user-confirm-authorization", "out-authorization-no", request.OutAuthorizationNumber); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } #endregion #region MerchantTransfer/TransferToQQWalletBills diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.cs new file mode 100644 index 00000000..d7852d21 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.cs @@ -0,0 +1,128 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口的请求。 + /// + [WechatTenpaySensitive] + public class CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest : WechatTenpayRequest + { + public static class Types + { + public class TransferSceneReportInfo : CreateFundAppMerchantTransferBillRequest.Types.TransferSceneReportInfo + { + } + + public class AuthorizationInfo + { + /// + /// 获取或设置用户展示名称。 + /// + [Newtonsoft.Json.JsonProperty("user_display_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_display_name")] + public string UserDisplayName { get; set; } = string.Empty; + + /// + /// 获取或设置商户侧授权单号。 + /// + [Newtonsoft.Json.JsonProperty("out_authorization_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")] + public string OutAuthorizationNumber { get; set; } = string.Empty; + + /// + /// 获取或设置免确认收款授权结果通知地址。 + /// + [Newtonsoft.Json.JsonProperty("authorization_notify_url")] + [System.Text.Json.Serialization.JsonPropertyName("authorization_notify_url")] + public string NotifyUrl { get; set; } = string.Empty; + } + } + + /// + /// 获取或设置微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = string.Empty; + + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonProperty("out_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_bill_no")] + public string OutBillNumber { get; set; } = string.Empty; + + /// + /// 获取或设置转账金额(单位:分)。 + /// + [Newtonsoft.Json.JsonProperty("transfer_amount")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_amount")] + public int TransferAmount { get; set; } + + /// + /// 获取或设置转账备注。 + /// + [Newtonsoft.Json.JsonProperty("transfer_remark")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_remark")] + public string TransferRemark { get; set; } = string.Empty; + + /// + /// 获取或设置收款用户 OpenId。 + /// + [Newtonsoft.Json.JsonProperty("openid")] + [System.Text.Json.Serialization.JsonPropertyName("openid")] + public string? OpenId { get; set; } + + /// + /// 获取或设置收款用户姓名(需使用平台公钥/证书加密)。 + /// + [Newtonsoft.Json.JsonProperty("user_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_name")] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_RSA_2048_WITH_SHA256, algorithm: Constants.EncryptionAlgorithms.RSA_2048_ECB_PKCS8_OAEP_WITH_SHA1_AND_MGF1)] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_SM2_WITH_SM3, algorithm: Constants.EncryptionAlgorithms.SM2_C1C3C2_ASN1)] + public string? UserName { get; set; } + + /// + /// 获取或设置转账场景 ID。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_id")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_id")] + public string? TransferSceneId { get; set; } + + /// + /// 获取或设置通知地址。 + /// + [Newtonsoft.Json.JsonProperty("notify_url")] + [System.Text.Json.Serialization.JsonPropertyName("notify_url")] + public string? NotifyUrl { get; set; } + + /// + /// 获取或设置用户收款感知。 + /// + [Newtonsoft.Json.JsonProperty("user_recv_perception")] + [System.Text.Json.Serialization.JsonPropertyName("user_recv_perception")] + public string? UserReceivePerception { get; set; } + + /// + /// 获取或设置转账场景报备信息列表。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_report_infos")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_report_infos")] + public IList? TransferSceneReportInfoList { get; set; } + + /// + /// 获取或设置免确认收款授权信息。 + /// + [Newtonsoft.Json.JsonProperty("authorization_info")] + [System.Text.Json.Serialization.JsonPropertyName("authorization_info")] + public Types.AuthorizationInfo? AuthorizationInfo { get; set; } + + /// + /// 获取或设置出资商户号。 + /// + [Newtonsoft.Json.JsonProperty("sponsor_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sponsor_mchid")] + public string? SponsorMerchantId { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.cs new file mode 100644 index 00000000..30e5717d --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.cs @@ -0,0 +1,61 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization 接口的响应。 + /// + public class CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse : WechatTenpayResponse + { + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonProperty("out_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_bill_no")] + public string OutBillNumber { get; set; } = default!; + + /// + /// 获取或设置微信转账单号。 + /// + [Newtonsoft.Json.JsonProperty("transfer_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_bill_no")] + public string TransferBillNumber { get; set; } = default!; + + /// + /// 获取或设置单据状态。 + /// + [Newtonsoft.Json.JsonProperty("state")] + [System.Text.Json.Serialization.JsonPropertyName("state")] + public string State { get; set; } = default!; + + /// + /// 获取或设置单据创建时间。 + /// + [Newtonsoft.Json.JsonProperty("create_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("create_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset CreateTime { get; set; } + + /// + /// 获取或设置跳转领取页面的携带信息。 + /// + [Newtonsoft.Json.JsonProperty("package_info")] + [System.Text.Json.Serialization.JsonPropertyName("package_info")] + public string? PackageInfo { get; set; } + + /// + /// 获取或设置用户展示昵称。 + /// + [Newtonsoft.Json.JsonProperty("user_display_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_display_name")] + public string? UserDisplayName { get; set; } + + /// + /// 获取或设置商户侧授权单号。 + /// + [Newtonsoft.Json.JsonProperty("out_authorization_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")] + public string? OutAuthorizationNumber { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.cs new file mode 100644 index 00000000..1d6e686e --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.cs @@ -0,0 +1,97 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-bills/transfer 接口的请求。 + /// + [WechatTenpaySensitive] + public class CreateFundAppMerchantTransferBillTransferRequest : WechatTenpayRequest + { + public static class Types + { + public class TransferSceneReportInfo : CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.Types.TransferSceneReportInfo + { + } + } + + /// + /// 获取或设置微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = string.Empty; + + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonProperty("out_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_bill_no")] + public string OutBillNumber { get; set; } = string.Empty; + + /// + /// 获取或设置转账金额(单位:分)。 + /// + [Newtonsoft.Json.JsonProperty("transfer_amount")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_amount")] + public int TransferAmount { get; set; } + + /// + /// 获取或设置转账备注。 + /// + [Newtonsoft.Json.JsonProperty("transfer_remark")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_remark")] + public string TransferRemark { get; set; } = string.Empty; + + /// + /// 获取或设置微信免确认收款授权单号。 + /// + [Newtonsoft.Json.JsonProperty("authorization_id")] + [System.Text.Json.Serialization.JsonPropertyName("authorization_id")] + public string AuthorizationId { get; set; } = string.Empty; + + /// + /// 获取或设置收款用户姓名(需使用平台公钥/证书加密)。 + /// + [Newtonsoft.Json.JsonProperty("user_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_name")] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_RSA_2048_WITH_SHA256, algorithm: Constants.EncryptionAlgorithms.RSA_2048_ECB_PKCS8_OAEP_WITH_SHA1_AND_MGF1)] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_SM2_WITH_SM3, algorithm: Constants.EncryptionAlgorithms.SM2_C1C3C2_ASN1)] + public string? UserName { get; set; } + + /// + /// 获取或设置转账场景 ID。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_id")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_id")] + public string? TransferSceneId { get; set; } + + /// + /// 获取或设置通知地址。 + /// + [Newtonsoft.Json.JsonProperty("notify_url")] + [System.Text.Json.Serialization.JsonPropertyName("notify_url")] + public string? NotifyUrl { get; set; } + + /// + /// 获取或设置用户收款感知。 + /// + [Newtonsoft.Json.JsonProperty("user_recv_perception")] + [System.Text.Json.Serialization.JsonPropertyName("user_recv_perception")] + public string? UserReceivePerception { get; set; } + + /// + /// 获取或设置转账场景报备信息列表。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_report_infos")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_report_infos")] + public IList? TransferSceneReportInfoList { get; set; } + + /// + /// 获取或设置出资商户号。 + /// + [Newtonsoft.Json.JsonProperty("sponsor_mchid")] + [System.Text.Json.Serialization.JsonPropertyName("sponsor_mchid")] + public string? SponsorMerchantId { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.cs new file mode 100644 index 00000000..82712885 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.cs @@ -0,0 +1,101 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-bills/transfer 接口的响应。 + /// + [WechatTenpaySensitive] + public class CreateFundAppMerchantTransferBillTransferResponse : WechatTenpayResponse + { + /// + /// 获取或设置微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mch_id")] + [System.Text.Json.Serialization.JsonPropertyName("mch_id")] + public string MerchantId { get; set; } = default!; + + /// + /// 获取或设置微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = default!; + + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonProperty("out_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_bill_no")] + public string OutBillNumber { get; set; } = default!; + + /// + /// 获取或设置微信转账单号。 + /// + [Newtonsoft.Json.JsonProperty("transfer_bill_no")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_bill_no")] + public string TransferBillNumber { get; set; } = default!; + + /// + /// 获取或设置单据状态。 + /// + [Newtonsoft.Json.JsonProperty("state")] + [System.Text.Json.Serialization.JsonPropertyName("state")] + public string State { get; set; } = default!; + + /// + /// 获取或设置转账金额(单位:分)。 + /// + [Newtonsoft.Json.JsonProperty("transfer_amount")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_amount")] + public int TransferAmount { get; set; } + + /// + /// 获取或设置转账备注。 + /// + [Newtonsoft.Json.JsonProperty("transfer_remark")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_remark")] + public string TransferRemark { get; set; } = default!; + + /// + /// 获取或设置收款用户 OpenId。 + /// + [Newtonsoft.Json.JsonProperty("openid")] + [System.Text.Json.Serialization.JsonPropertyName("openid")] + public string? OpenId { get; set; } + + /// + /// 获取或设置收款用户姓名(需使用商户私钥解密)。 + /// + [Newtonsoft.Json.JsonProperty("user_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_name")] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_RSA_2048_WITH_SHA256, algorithm: Constants.EncryptionAlgorithms.RSA_2048_ECB_PKCS8_OAEP_WITH_SHA1_AND_MGF1)] + [WechatTenpaySensitiveProperty(scheme: Constants.SignSchemes.WECHATPAY2_SM2_WITH_SM3, algorithm: Constants.EncryptionAlgorithms.SM2_C1C3C2_ASN1)] + public string? UserName { get; set; } + + /// + /// 获取或设置单据创建时间。 + /// + [Newtonsoft.Json.JsonProperty("create_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("create_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset CreateTime { get; set; } + + /// + /// 获取或设置单据更新时间。 + /// + [Newtonsoft.Json.JsonProperty("update_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("update_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset UpdateTime { get; set; } + + /// + /// 获取或设置失败原因。 + /// + [Newtonsoft.Json.JsonProperty("fail_reason")] + [System.Text.Json.Serialization.JsonPropertyName("fail_reason")] + public string? FailReason { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest.cs new file mode 100644 index 00000000..2e1fa3d5 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /fund-app/mch-transfer/user-confirm-authorization/out-authorization-no/{out_authorization_no} 接口的请求。 + /// + public class GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberRequest : WechatTenpayRequest + { + /// + /// 获取或设置商户侧授权单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string OutAuthorizationNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.cs new file mode 100644 index 00000000..0ea48198 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.cs @@ -0,0 +1,90 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /fund-app/mch-transfer/user-confirm-authorization/out-authorization-no/{out_authorization_no} 接口的响应。 + /// + public class GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse : WechatTenpayResponse + { + public static class Types + { + public class CloseInfo + { + /// + /// 获取或设置关闭原因。 + /// + [Newtonsoft.Json.JsonProperty("close_reason")] + [System.Text.Json.Serialization.JsonPropertyName("close_reason")] + public string CloseReason { get; set; } = default!; + + /// + /// 获取或设置关闭时间。 + /// + [Newtonsoft.Json.JsonProperty("close_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("close_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset CloseTime { get; set; } + } + } + + /// + /// 获取或设置微信 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string AppId { get; set; } = default!; + + /// + /// 获取或设置商户侧授权单号。 + /// + [Newtonsoft.Json.JsonProperty("out_authorization_no")] + [System.Text.Json.Serialization.JsonPropertyName("out_authorization_no")] + public string OutAuthorizationNumber { get; set; } = default!; + + /// + /// 获取或设置微信免确认收款授权单号。 + /// + [Newtonsoft.Json.JsonProperty("authorization_id")] + [System.Text.Json.Serialization.JsonPropertyName("authorization_id")] + public string AuthorizationId { get; set; } = default!; + + /// + /// 获取或设置授权状态。 + /// + [Newtonsoft.Json.JsonProperty("state")] + [System.Text.Json.Serialization.JsonPropertyName("state")] + public string State { get; set; } = default!; + + /// + /// 获取或设置收款用户 OpenId。 + /// + [Newtonsoft.Json.JsonProperty("openid")] + [System.Text.Json.Serialization.JsonPropertyName("openid")] + public string OpenId { get; set; } = default!; + + /// + /// 获取或设置用户确认授权的时间。 + /// + [Newtonsoft.Json.JsonProperty("authorize_time")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.Rfc3339DateTimeOffsetConverter))] + [System.Text.Json.Serialization.JsonPropertyName("authorize_time")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.Rfc3339DateTimeOffsetConverter))] + public DateTimeOffset AuthorizeTime { get; set; } + + /// + /// 获取或设置用户展示昵称。 + /// + [Newtonsoft.Json.JsonProperty("user_display_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_display_name")] + public string UserDisplayName { get; set; } = default!; + + /// + /// 获取或设置关闭信息。 + /// + [Newtonsoft.Json.JsonProperty("close_info")] + [System.Text.Json.Serialization.JsonPropertyName("close_info")] + public Types.CloseInfo? CloseInfo { get; set; } + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.json new file mode 100644 index 00000000..532d0e77 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferAuthorizationConfirmedResource.json @@ -0,0 +1,9 @@ +{ + "out_authorization_no": "plfk2020042013", + "appid": "102022609", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_display_name": "wx_123456", + "authorization_id": "201202504101000123456789012", + "state": "TAKING_EFFECT", + "authorize_time": "2015-05-20T13:29:35.120+08:00" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.json new file mode 100644 index 00000000..1c38c69e --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest.json @@ -0,0 +1,23 @@ +{ + "appid": "wxf636efh567hg4356", + "out_bill_no": "plfk2020042013", + "transfer_scene_id": "1000", + "openid": "o-MYE42l80oelYMDE34nYD456Xoy", + "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "notify_url": "https://www.weixin.qq.com/wxpay/pay.php", + "user_recv_perception": "现金奖励", + "transfer_scene_report_infos": [ + { + "info_type": "活动名称", + "info_content": "新会员有礼" + } + ], + "authorization_info": { + "user_display_name": "wx_123456", + "out_authorization_no": "plfk2020042013", + "authorization_notify_url": "https://www.weixin.qq.com/wxpay/pay.php" + }, + "sponsor_mchid": "1900001109" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.json new file mode 100644 index 00000000..d0355d89 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillPreTransferWithAuthorizationResponse.json @@ -0,0 +1,9 @@ +{ + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1330000071100999991182020050700019480001", + "create_time": "2015-05-20T13:29:35.120+08:00", + "state": "ACCEPTED", + "package_info": "affffddafdfafddffda==", + "user_display_name": "wx_123456", + "out_authorization_no": "plfk2020042013" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.json new file mode 100644 index 00000000..13dabb5e --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferRequest.json @@ -0,0 +1,18 @@ +{ + "appid": "wxf636efh567hg4356", + "out_bill_no": "plfk2020042013", + "transfer_scene_id": "1000", + "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "notify_url": "https://www.weixin.qq.com/wxpay/pay.php", + "user_recv_perception": "现金奖励", + "transfer_scene_report_infos": [ + { + "info_type": "活动名称", + "info_content": "新会员有礼" + } + ], + "authorization_id": "201202504101000123456789012", + "sponsor_mchid": "1900001109" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.json new file mode 100644 index 00000000..ba585199 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/CreateFundAppMerchantTransferBillTransferResponse.json @@ -0,0 +1,14 @@ +{ + "mch_id": "1900001109", + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1330000071100999991182020050700019480001", + "appid": "wxf636efh567hg4356", + "state": "SUCCESS", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "fail_reason": "PAYEE_ACCOUNT_ABNORMAL", + "openid": "o-MYE42l80oelYMDE34nYD456Xoy", + "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45", + "create_time": "2015-05-20T13:29:35.120+08:00", + "update_time": "2015-05-20T13:29:35.120+08:00" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.json new file mode 100644 index 00000000..ab8280d1 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferBills/GetFundAppMerchantTransferUserConfirmAuthorizationByOutAuthorizationNumberResponse.json @@ -0,0 +1,13 @@ +{ + "out_authorization_no": "plfk2020042013", + "appid": "102022609", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_display_name": "wx_123456", + "authorization_id": "201202504101000123456789012", + "state": "TAKING_EFFECT", + "authorize_time": "2015-05-20T13:29:35.120+08:00", + "close_info": { + "close_time": "2015-05-20T13:29:35.120+08:00", + "close_reason": "USER_CLOSE" + } +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs index 62943900..79fd7069 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs @@ -854,6 +854,112 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests } } + [Fact(DisplayName = "测试用例:加密请求中的敏感数据([POST] /fund-app/mch-transfer/transfer-bills/pre-transfer-with-authorization)")] + public async Task TestEncryptRequestSensitiveProperty_CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest() + { + static Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest GenerateMockRequestModel() + { + return new Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest() + { + UserName = MOCK_PLAIN_STR + }; + } + + static void AssertMockRequestModel(Models.CreateFundAppMerchantTransferBillPreTransferWithAuthorizationRequest request, Func decryptor) + { + Assert.NotEqual(MOCK_PLAIN_STR, request.UserName!); + Assert.Equal(MOCK_PLAIN_STR, decryptor.Invoke(request.UserName!)); + Assert.Equal(MOCK_CERT_SN, request.WechatpaySerialNumber!, ignoreCase: true); + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantRSACertificatePrivateKey)) + { + using (var client = CreateMockClientUseRSA(autoEncrypt: false)) + { + var request = GenerateMockRequestModel(); + client.EncryptRequestSensitiveProperty(request); + AssertMockRequestModel(request, (cipher) => Utilities.RSAUtility.DecryptWithECB(RSA_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + + using (var client = CreateMockClientUseRSA(autoEncrypt: true)) + { + var request = GenerateMockRequestModel(); + await client.ExecuteCreateFundAppMerchantTransferBillPreTransferWithAuthorizationAsync(request); + AssertMockRequestModel(request, (cipher) => Utilities.RSAUtility.DecryptWithECB(RSA_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantSM2CertificatePrivateKey)) + { + using (var client = CreateMockClientUseSM2(autoEncrypt: false)) + { + var request = GenerateMockRequestModel(); + client.EncryptRequestSensitiveProperty(request); + AssertMockRequestModel(request, (cipher) => Utilities.SM2Utility.Decrypt(SM2_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + + using (var client = CreateMockClientUseSM2(autoEncrypt: true)) + { + var request = GenerateMockRequestModel(); + await client.ExecuteCreateFundAppMerchantTransferBillPreTransferWithAuthorizationAsync(request); + AssertMockRequestModel(request, (cipher) => Utilities.SM2Utility.Decrypt(SM2_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + } + } + + [Fact(DisplayName = "测试用例:加密请求中的敏感数据([POST] /fund-app/mch-transfer/transfer-bills/transfer)")] + public async Task TestEncryptRequestSensitiveProperty_CreateFundAppMerchantTransferBillTransferRequest() + { + static Models.CreateFundAppMerchantTransferBillTransferRequest GenerateMockRequestModel() + { + return new Models.CreateFundAppMerchantTransferBillTransferRequest() + { + UserName = MOCK_PLAIN_STR + }; + } + + static void AssertMockRequestModel(Models.CreateFundAppMerchantTransferBillTransferRequest request, Func decryptor) + { + Assert.NotEqual(MOCK_PLAIN_STR, request.UserName!); + Assert.Equal(MOCK_PLAIN_STR, decryptor.Invoke(request.UserName!)); + Assert.Equal(MOCK_CERT_SN, request.WechatpaySerialNumber!, ignoreCase: true); + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantRSACertificatePrivateKey)) + { + using (var client = CreateMockClientUseRSA(autoEncrypt: false)) + { + var request = GenerateMockRequestModel(); + client.EncryptRequestSensitiveProperty(request); + AssertMockRequestModel(request, (cipher) => Utilities.RSAUtility.DecryptWithECB(RSA_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + + using (var client = CreateMockClientUseRSA(autoEncrypt: true)) + { + var request = GenerateMockRequestModel(); + await client.ExecuteCreateFundAppMerchantTransferBillTransferAsync(request); + AssertMockRequestModel(request, (cipher) => Utilities.RSAUtility.DecryptWithECB(RSA_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantSM2CertificatePrivateKey)) + { + using (var client = CreateMockClientUseSM2(autoEncrypt: false)) + { + var request = GenerateMockRequestModel(); + client.EncryptRequestSensitiveProperty(request); + AssertMockRequestModel(request, (cipher) => Utilities.SM2Utility.Decrypt(SM2_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + + using (var client = CreateMockClientUseSM2(autoEncrypt: true)) + { + var request = GenerateMockRequestModel(); + await client.ExecuteCreateFundAppMerchantTransferBillTransferAsync(request); + AssertMockRequestModel(request, (cipher) => Utilities.SM2Utility.Decrypt(SM2_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + } + } + [Fact(DisplayName = "测试用例:加密请求中的敏感数据([POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills)")] public async Task TestEncryptRequestSensitiveProperty_CreateFundAppMerchantTransferToQQWalletBillRequest() { diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs index 03108589..51870b6c 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs @@ -370,6 +370,67 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests } } + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([POST] /ecommerce/mch-transfer/transfer-bills/transfer)")] + public async Task TestDecryptResponseSensitiveProperty_CreateFundAppMerchantTransferBillTransferResponse() + { + static Models.CreateFundAppMerchantTransferBillTransferResponse GenerateMockResponseModel(Func encryptor) + { + return SetMockResponseRawStatusAsOk(new Models.CreateFundAppMerchantTransferBillTransferResponse() + { + UserName = encryptor.Invoke(MOCK_PLAIN_STR) + }); + } + + static void AssertMockResponseModel(Models.CreateFundAppMerchantTransferBillTransferResponse response) + { + Assert.Equal(MOCK_PLAIN_STR, response.UserName!); + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantRSACertificatePrivateKey)) + { + using (var client = CreateMockClientUseRSA(autoDecrypt: false)) + { + var response = GenerateMockResponseModel((plain) => Utilities.RSAUtility.EncryptWithECBByCertificate(RSA_PEM_CERTIFICATE, plain)!); + client.DecryptResponseSensitiveProperty(response); + AssertMockResponseModel(response); + } + + using (var client = CreateMockClientUseRSA( + autoDecrypt: true, + mockResponseContent: new SystemTextJsonSerializer().Serialize( + GenerateMockResponseModel((plain) => Utilities.RSAUtility.EncryptWithECBByCertificate(RSA_PEM_CERTIFICATE, plain)!) + ) + )) + { + var request = new Models.CreateFundAppMerchantTransferBillTransferRequest(); + var response = await client.ExecuteCreateFundAppMerchantTransferBillTransferAsync(request); + AssertMockResponseModel(response); + } + } + + if (!string.IsNullOrEmpty(TestConfigs.WechatMerchantSM2CertificatePrivateKey)) + { + using (var client = CreateMockClientUseSM2(autoDecrypt: false)) + { + var response = GenerateMockResponseModel((plain) => Utilities.SM2Utility.EncryptByCertificate(SM2_PEM_CERTIFICATE, plain)!); + client.DecryptResponseSensitiveProperty(response); + AssertMockResponseModel(response); + } + + using (var client = CreateMockClientUseSM2( + autoDecrypt: true, + mockResponseContent: new SystemTextJsonSerializer().Serialize( + GenerateMockResponseModel((plain) => Utilities.SM2Utility.EncryptByCertificate(SM2_PEM_CERTIFICATE, plain)!) + ) + )) + { + var request = new Models.CreateFundAppMerchantTransferBillTransferRequest(); + var response = await client.ExecuteCreateFundAppMerchantTransferBillTransferAsync(request); + AssertMockResponseModel(response); + } + } + } + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /ecommerce/mch-transfer/transfer-bills/transfer-bill-no/{transfer_bill_no})")] public async Task TestDecryptResponseSensitiveProperty_GetEcommerceMerchantTransferBillByTransferBillNumberResponse() { @@ -553,7 +614,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests } } - [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no})")] + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /fund-app/brand-redpacket/brand-merchant-out-batches/{out_batch_no}/out-details/{out_detail_no})")] public async Task TestDecryptResponseSensitiveProperty_GetFundAppBrandRedPacketBrandMerchantBatchDetailByOutDetailNumberResponse() { static Models.GetFundAppBrandRedPacketBrandMerchantBatchDetailByOutDetailNumberResponse GenerateMockResponseModel(Func encryptor)