From d2ecffba9b101b94716dfdf2b02b0e11a7b6c61c Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Tue, 11 Jun 2024 23:41:20 +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=90=88=E5=8D=95=E6=9F=A5=E8=AF=A2=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...GetCombineTransactionByCombineOutTradeNumberResponse.cs | 7 +++++++ .../_/CombineTransactions/CombineTransactionResource.json | 5 +++-- ...tCombineTransactionByCombineOutTradeNumberResponse.json | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs index 7d5ec205..a9cc7aef 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Models/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.cs @@ -42,6 +42,13 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Models [Newtonsoft.Json.JsonProperty("payer_currency")] [System.Text.Json.Serialization.JsonPropertyName("payer_currency")] public string PayerCurrency { get; set; } = default!; + + /// + /// 获取或设置结算汇率(格式:外币兑换人民币的比例乘以 10 的 8 次方)。 + /// + [Newtonsoft.Json.JsonProperty("settlement_rate")] + [System.Text.Json.Serialization.JsonPropertyName("settlement_rate")] + public long? SettlementRate { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/CombineTransactions/CombineTransactionResource.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/CombineTransactions/CombineTransactionResource.json index 8b0c5c2a..e6821d74 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/CombineTransactions/CombineTransactionResource.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/_/CombineTransactions/CombineTransactionResource.json @@ -1,4 +1,4 @@ -{ +{ "combine_appid": "wxd678efh567hg6787", "combine_out_trade_no": "20150806125346", "combine_mchid": "1900000109", @@ -16,7 +16,8 @@ "total_amount": 10, "currency": "CNY", "payer_amount": 10, - "payer_currency": "CNY" + "payer_currency": "CNY", + "settlement_rate": 650000000 }, "success_time": "2015-05-20T13:29:35.120+08:00", "transaction_id": "1009660380201506130728806387", diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.json index 9d80fab5..111373b7 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/_/CombineTransactions/GetCombineTransactionByCombineOutTradeNumberResponse.json @@ -1,4 +1,4 @@ -{ +{ "combine_appid": "wxd678efh567hg6787", "combine_mchid": "1230000109", "combine_payer_info": { @@ -16,7 +16,8 @@ "total_amount": 10, "payer_amount": 10, "currency": "CNY", - "payer_currency": "CNY" + "payer_currency": "CNY", + "settlement_rate": 650000000 }, "transaction_id": "1009660380201506130728806387", "out_trade_no": "20150806125346",