From dd59c13bc834951ccee082a96bb2d45dd48a579b Mon Sep 17 00:00:00 2001 From: fudiwei Date: Sat, 26 Nov 2022 22:12:18 +0800 Subject: [PATCH] =?UTF-8?q?feat(tenpayv3):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E5=AE=B6=E8=BD=AC=E8=B4=A6=E5=88=B0?= =?UTF-8?q?=E9=9B=B6=E9=92=B1=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Batches/CreateTransferBatchRequest.cs | 16 ++++++++++++++++ .../GetTransferBatchByOutBatchNumberResponse.cs | 9 ++++++++- .../Batches/CreateTransferBatchRequest.json | 8 +++++--- .../GetTransferBatchByBatchIdResponse.json | 5 +++-- ...GetTransferBatchByOutBatchNumberResponse.json | 5 +++-- ...GetTransferBatchDetailByDetailIdResponse.json | 2 +- 6 files changed, 36 insertions(+), 9 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/CreateTransferBatchRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/CreateTransferBatchRequest.cs index b5c8777c..395efe2a 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/CreateTransferBatchRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/CreateTransferBatchRequest.cs @@ -48,6 +48,15 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [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("user_id_card")] + [System.Text.Json.Serialization.JsonPropertyName("user_id_card")] + [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? UserIdCardNumber { get; set; } } } @@ -99,5 +108,12 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("transfer_detail_list")] [System.Text.Json.Serialization.JsonPropertyName("transfer_detail_list")] public IList TransferDetailList { get; set; } = new List(); + + /// + /// 获取或设置转账场景 ID。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_id")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_id")] + public string? TransferSceneId { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.cs index 1e7198af..9a050058 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models { @@ -133,6 +133,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("fail_num")] [System.Text.Json.Serialization.JsonPropertyName("fail_num")] public int FailNumber { get; set; } + + /// + /// 获取或设置转账场景 ID。 + /// + [Newtonsoft.Json.JsonProperty("transfer_scene_id")] + [System.Text.Json.Serialization.JsonPropertyName("transfer_scene_id")] + public string? TransferSceneId { get; set; } } public class TransferDetail diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/CreateTransferBatchRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/CreateTransferBatchRequest.json index 4d12a77c..559226d3 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/CreateTransferBatchRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/CreateTransferBatchRequest.json @@ -1,4 +1,4 @@ -{ +{ "appid": "wxf636efh567hg4356", "out_batch_no": "plfk2020042013", "batch_name": "2019年1月深圳分部报销单", @@ -11,7 +11,9 @@ "transfer_amount": 200000, "transfer_remark": "2020年4月报销", "openid": "o-MYE42l80oelYMDE34nYD456Xoy", - "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45" + "user_name": "757b340b45ebef5467rter35gf464344v3542sdf4t6re4tb4f54ty45t4yyry45", + "user_id_card": "8609cb22e1774a50a930e414cc71eca06121bcd266335cda230d24a7886a8d9f" } - ] + ], + "transfer_scene_id": "1000" } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByBatchIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByBatchIdResponse.json index 983f34cb..66f9a524 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByBatchIdResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByBatchIdResponse.json @@ -1,4 +1,4 @@ -{ +{ "transfer_batch": { "mchid": "1900001109", "out_batch_no": "plfk2020042013", @@ -16,7 +16,8 @@ "success_amount": 3900000, "success_num": 199, "fail_amount": 100000, - "fail_num": 1 + "fail_num": 1, + "transfer_scene_id": "1000" }, "transfer_detail_list": [ { diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.json index 983f34cb..66f9a524 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchByOutBatchNumberResponse.json @@ -1,4 +1,4 @@ -{ +{ "transfer_batch": { "mchid": "1900001109", "out_batch_no": "plfk2020042013", @@ -16,7 +16,8 @@ "success_amount": 3900000, "success_num": 199, "fail_amount": 100000, - "fail_num": 1 + "fail_num": 1, + "transfer_scene_id": "1000" }, "transfer_detail_list": [ { diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchDetailByDetailIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchDetailByDetailIdResponse.json index 032f0cf4..da93bf29 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchDetailByDetailIdResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/Transfer/Batches/GetTransferBatchDetailByDetailIdResponse.json @@ -1,4 +1,4 @@ -{ +{ "mchid": "1900001109", "out_batch_no": "plfk2020042013", "batch_id": "1030000071100999991182020050700019480001",