diff --git a/docs/WechatTenpayV3/Basic_ModelDefinition.md b/docs/WechatTenpayV3/Basic_ModelDefinition.md index 5018fd33..aacf9db6 100644 --- a/docs/WechatTenpayV3/Basic_ModelDefinition.md +++ b/docs/WechatTenpayV3/Basic_ModelDefinition.md @@ -208,7 +208,16 @@ - 微信单号查询电子回单:`GetFundAppMerchantTransferElecsignByTransferBillNumber` - - 转账到零钱 + + - 商家转账到 QQ 钱包 + + - 发起转账到 QQ 钱包:`CreateFundAppMerchantTransferToQQWalletBill` + + - 撤销转账到 QQ 钱包:`CancelFundAppMerchantTransferToQQWalletBill` + + - 查询转账到 QQ 钱包的结果:`GetFundAppMerchantTransferToQQWalletBillByOutBillNumber` + + - 商家转账到零钱 - 发起批量转账:`CreateTransferBatch` diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs index 07ba3af7..006ef729 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferBillFinishedResource.cs @@ -53,13 +53,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events [System.Text.Json.Serialization.JsonPropertyName("openid")] public string? OpenId { get; set; } - /// - /// 获取或设置失败原因。 - /// - [Newtonsoft.Json.JsonProperty("fail_reason")] - [System.Text.Json.Serialization.JsonPropertyName("fail_reason")] - public string? FailReason { get; set; } - /// /// 获取或设置更新时间。 /// @@ -77,5 +70,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events [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("fail_reason")] + [System.Text.Json.Serialization.JsonPropertyName("fail_reason")] + public string? FailReason { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.cs new file mode 100644 index 00000000..c10a1cab --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.cs @@ -0,0 +1,109 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events +{ + /// + /// 表示 MCHTRANSFER.QQWALLETBILL.FINISHED", 通知的数据。 + /// + /// REF:
+ ///
+ ///
+ ///
+ public class MerchantTransferQQWalletBillFinishedResource : WechatTenpayEvent.Types.IDecryptedResource + { + /// + /// 获取或设置微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string MerchantId { get; set; } = default!; + + /// + /// 获取或设置 QQ 互联开放平台 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; } + + /// + /// 获取或设置收款用户的 QQ 号。 + /// + [Newtonsoft.Json.JsonProperty("user_qq")] + [System.Text.Json.Serialization.JsonPropertyName("user_qq")] + public string? UserQQ { get; set; } + + /// + /// 获取或设置收款用户姓名(需使用商户私钥解密)。 + /// + [Newtonsoft.Json.JsonProperty("user_name")] + [System.Text.Json.Serialization.JsonPropertyName("user_name")] + public string? UserName { 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("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("fail_reason")] + [System.Text.Json.Serialization.JsonPropertyName("fail_reason")] + public string? FailReason { get; set; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs index 073f0993..6db282cb 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Extensions/WechatTenpayClientExecuteFundAppExtensions.cs @@ -189,6 +189,74 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3 return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); } #endregion + + #region MerchantTransfer/TransferToQQWalletBills + /// + /// 异步调用 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteCreateFundAppMerchantTransferToQQWalletBillAsync(this WechatTenpayClient client, Models.CreateFundAppMerchantTransferToQQWalletBillRequest 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-to-qq-wallet-bills"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no}/cancel 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteCancelFundAppMerchantTransferToQQWalletBillAsync(this WechatTenpayClient client, Models.CancelFundAppMerchantTransferToQQWalletBillRequest 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-to-qq-wallet-bills", request.OutBillNumber, "cancel"); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + + /// + /// 异步调用 [GET] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no} 接口。 + /// + /// REF:
+ /// + ///
+ ///
+ /// + /// + /// + /// + public static async Task ExecuteGetFundAppMerchantTransferToQQWalletBillByOutBillNumberAsync(this WechatTenpayClient client, Models.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest 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", "transfer-to-qq-wallet-bills", request.OutBillNumber); + + return await client.SendFlurlRequestAsJsonAsync(flurlReq, data: request, cancellationToken: cancellationToken).ConfigureAwait(false); + } + #endregion #endregion } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillRequest.cs new file mode 100644 index 00000000..d6c8a629 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillRequest.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no}/cancel 接口的请求。 + /// + public class CancelFundAppMerchantTransferToQQWalletBillRequest : WechatTenpayRequest + { + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string OutBillNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.cs new file mode 100644 index 00000000..ac14e988 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.cs @@ -0,0 +1,9 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no}/cancel 接口的响应。 + /// + public class CancelFundAppMerchantTransferToQQWalletBillResponse : GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse + { + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.cs new file mode 100644 index 00000000..fa343223 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.cs @@ -0,0 +1,76 @@ +using System.Collections.Generic; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills 接口的请求。 + /// + [WechatTenpaySensitive] + public class CreateFundAppMerchantTransferToQQWalletBillRequest : WechatTenpayRequest + { + /// + /// 获取或设置 QQ 互联开放平台 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; } + + /// + /// 获取或设置收款用户 QQ 号。 + /// + [Newtonsoft.Json.JsonProperty("user_qq")] + [System.Text.Json.Serialization.JsonPropertyName("user_qq")] + public string? UserQQ { 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; } + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.cs new file mode 100644 index 00000000..579374dd --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.cs @@ -0,0 +1,9 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills 接口的响应。 + /// + public class CreateFundAppMerchantTransferToQQWalletBillResponse : GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse + { + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest.cs new file mode 100644 index 00000000..bc19b57e --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest.cs @@ -0,0 +1,15 @@ +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no} 接口的请求。 + /// + public class GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest : WechatTenpayRequest + { + /// + /// 获取或设置商户单号。 + /// + [Newtonsoft.Json.JsonIgnore] + [System.Text.Json.Serialization.JsonIgnore] + public string OutBillNumber { get; set; } = string.Empty; + } +} diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.cs new file mode 100644 index 00000000..0b0215a8 --- /dev/null +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.cs @@ -0,0 +1,108 @@ +using System; + +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models +{ + /// + /// 表示 [GET] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no} 接口的响应。 + /// + [WechatTenpaySensitive] + public class GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse : WechatTenpayResponse + { + /// + /// 获取或设置微信商户号。 + /// + [Newtonsoft.Json.JsonProperty("mchid")] + [System.Text.Json.Serialization.JsonPropertyName("mchid")] + public string MerchantId { get; set; } = default!; + + /// + /// 获取或设置 QQ 互联开放平台 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; } + + /// + /// 获取或设置收款用户 QQ 号。 + /// + [Newtonsoft.Json.JsonProperty("user_qq")] + [System.Text.Json.Serialization.JsonPropertyName("user_qq")] + public string? UserQQ { 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/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.json new file mode 100644 index 00000000..1f616518 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/MerchantTransfer/MerchantTransferQQWalletBillFinishedResource.json @@ -0,0 +1,15 @@ +{ + "mchid": "1900001109", + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1430000071100999991182020050700019480001", + "appid": "102022609", + "state": "SUCCESS", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "fail_reason": "", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_qq": "490379403", + "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/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.json new file mode 100644 index 00000000..b8fd9195 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CancelFundAppMerchantTransferToQQWalletBillResponse.json @@ -0,0 +1,15 @@ +{ + "mchid": "1900001109", + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1430000071100999991182020050700019480001", + "appid": "102022609", + "state": "SUCCESS", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "fail_reason": "PAYEE_ACCOUNT_ABNORMAL", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_qq": "490379403", + "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/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.json new file mode 100644 index 00000000..eb0ee637 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillRequest.json @@ -0,0 +1,11 @@ +{ + "appid": "102022609", + "out_bill_no": "plfk2020042013", + "transfer_scene_id": "1000", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_qq": "490379403", + "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "notify_url": "https://www.weixin.qq.com/wxpay/pay.php" +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.json new file mode 100644 index 00000000..b8fd9195 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/CreateFundAppMerchantTransferToQQWalletBillResponse.json @@ -0,0 +1,15 @@ +{ + "mchid": "1900001109", + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1430000071100999991182020050700019480001", + "appid": "102022609", + "state": "SUCCESS", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "fail_reason": "PAYEE_ACCOUNT_ABNORMAL", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_qq": "490379403", + "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/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.json new file mode 100644 index 00000000..b8fd9195 --- /dev/null +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/FundApp/MerchantTransfer/TransferToQQWalletBills/GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse.json @@ -0,0 +1,15 @@ +{ + "mchid": "1900001109", + "out_bill_no": "plfk2020042013", + "transfer_bill_no": "1430000071100999991182020050700019480001", + "appid": "102022609", + "state": "SUCCESS", + "transfer_amount": 400000, + "transfer_remark": "新会员开通有礼", + "fail_reason": "PAYEE_ACCOUNT_ABNORMAL", + "openid": "216BE837A39456BD6729F6F47D7C0EEE", + "user_qq": "490379403", + "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/TestCase_RequestEncryptionTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs index 0b601a6c..64ec0867 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_RequestEncryptionTests.cs @@ -854,6 +854,59 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests } } + [Fact(DisplayName = "测试用例:加密请求中的敏感数据([POST] /fund-app/mch-transfer/transfer-to-qq-wallet-bills)")] + public async Task TestEncryptRequestSensitiveProperty_CreateFundAppMerchantTransferToQQWalletBillRequest() + { + static Models.CreateFundAppMerchantTransferToQQWalletBillRequest GenerateMockRequestModel() + { + return new Models.CreateFundAppMerchantTransferToQQWalletBillRequest() + { + UserName = MOCK_PLAIN_STR + }; + } + + static void AssertMockRequestModel(Models.CreateFundAppMerchantTransferToQQWalletBillRequest 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.ExecuteCreateFundAppMerchantTransferToQQWalletBillAsync(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.ExecuteCreateFundAppMerchantTransferToQQWalletBillAsync(request); + AssertMockRequestModel(request, (cipher) => Utilities.SM2Utility.Decrypt(SM2_PEM_PRIVATE_KEY, (EncodedString)cipher)!); + } + } + } + [Fact(DisplayName = "测试用例:加密请求中的敏感数据([POST] /marketing/membercard-open/cards/{card_id}/phone-membercard/import)")] public async Task TestEncryptRequestSensitiveProperty_ImportMarketingMemberCardOpenCardPhoneRequest() { diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs index 56042d60..d283376c 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs @@ -431,6 +431,128 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests } } + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /fund-app/mch-transfer/transfer-bills/out-bill-no/{out_bill_no})")] + public async Task TestDecryptResponseSensitiveProperty_GetFundAppMerchantTransferBillByOutBillNumberResponse() + { + static Models.GetFundAppMerchantTransferBillByOutBillNumberResponse GenerateMockResponseModel(Func encryptor) + { + return SetMockResponseRawStatusAsOk(new Models.GetFundAppMerchantTransferBillByOutBillNumberResponse() + { + UserName = encryptor.Invoke(MOCK_PLAIN_STR) + }); + } + + static void AssertMockResponseModel(Models.GetFundAppMerchantTransferBillByOutBillNumberResponse 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.GetFundAppMerchantTransferBillByOutBillNumberRequest(); + var response = await client.ExecuteGetFundAppMerchantTransferBillByOutBillNumberAsync(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.GetFundAppMerchantTransferBillByOutBillNumberRequest(); + var response = await client.ExecuteGetFundAppMerchantTransferBillByOutBillNumberAsync(request); + AssertMockResponseModel(response); + } + } + } + + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /fund-app/mch-transfer/transfer-to-qq-wallet-bills/{out_bill_no})")] + public async Task TestDecryptResponseSensitiveProperty_GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse() + { + static Models.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse GenerateMockResponseModel(Func encryptor) + { + return SetMockResponseRawStatusAsOk(new Models.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse() + { + UserName = encryptor.Invoke(MOCK_PLAIN_STR) + }); + } + + static void AssertMockResponseModel(Models.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberResponse 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.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest(); + var response = await client.ExecuteGetFundAppMerchantTransferToQQWalletBillByOutBillNumberAsync(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.GetFundAppMerchantTransferToQQWalletBillByOutBillNumberRequest(); + var response = await client.ExecuteGetFundAppMerchantTransferToQQWalletBillByOutBillNumberAsync(request); + AssertMockResponseModel(response); + } + } + } + [Fact(DisplayName = "测试用例:解密响应中的敏感数据([GET] /marketing/shopping-receipt/shoppingreceipts)")] public async Task TestDecryptResponseSensitiveProperty_UploadMarketingShoppingReceiptResponse() {