From 9461f0892cc99ca118ecaa3438cd2354f7e69731 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Fri, 26 Aug 2022 22:38:35 +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=E6=99=BA=E6=85=A7=E5=95=86=E5=9C=88=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=9B=9E=E8=B0=83=E9=80=9A=E7=9F=A5=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessCircle/MallTransactionResource.cs | 34 +++++++++++++------ .../MallTransactionResource.json | 6 ++-- .../NotifyBusinessCirclePointsRequest.json | 3 +- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/BusinessCircle/MallTransactionResource.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/BusinessCircle/MallTransactionResource.cs index d5de7794..f4e46ee5 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/BusinessCircle/MallTransactionResource.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/Events/BusinessCircle/MallTransactionResource.cs @@ -1,4 +1,4 @@ -using System; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events { @@ -19,28 +19,28 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events /// [Newtonsoft.Json.JsonProperty("merchant_name")] [System.Text.Json.Serialization.JsonPropertyName("merchant_name")] - public string MerchantName { get; set; } = default!; + public string? MerchantName { get; set; } /// /// 获取或设置门店名称。 /// [Newtonsoft.Json.JsonProperty("shop_name")] [System.Text.Json.Serialization.JsonPropertyName("shop_name")] - public string ShopName { get; set; } = default!; + public string? ShopName { get; set; } /// /// 获取或设置门店编号。 /// [Newtonsoft.Json.JsonProperty("shop_number")] [System.Text.Json.Serialization.JsonPropertyName("shop_number")] - public string ShopNumber { get; set; } = default!; + public string? ShopNumber { get; set; } /// /// 获取或设置微信 AppId。 /// [Newtonsoft.Json.JsonProperty("appid")] [System.Text.Json.Serialization.JsonPropertyName("appid")] - public string AppId { get; set; } = default!; + public string? AppId { get; set; } /// /// 获取或设置用户唯一标识。 @@ -54,23 +54,23 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events /// [Newtonsoft.Json.JsonProperty("transaction_id")] [System.Text.Json.Serialization.JsonPropertyName("transaction_id")] - public string TransactionId { get; set; } = default!; + public string? TransactionId { get; set; } /// /// 获取或设置金额（单位：分）。 /// [Newtonsoft.Json.JsonProperty("amount")] [System.Text.Json.Serialization.JsonPropertyName("amount")] - public int Amount { get; set; } + public int? Amount { get; set; } /// /// 获取或设置交易完成时间。 /// [Newtonsoft.Json.JsonProperty("time_end")] - [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339DateTimeOffsetConverter))] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] [System.Text.Json.Serialization.JsonPropertyName("time_end")] - [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339DateTimeOffsetConverter))] - public DateTimeOffset SuccessTime { get; set; } + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Converters.RFC3339NullableDateTimeOffsetConverter))] + public DateTimeOffset? SuccessTime { get; set; } /// /// 获取或设置手动提交积分标记。 @@ -78,5 +78,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Events [Newtonsoft.Json.JsonProperty("commit_tag")] [System.Text.Json.Serialization.JsonPropertyName("commit_tag")] public string? CommitTag { get; set; } + + /// + /// 获取或设置授权类型。 + /// + [Newtonsoft.Json.JsonProperty("auth_type")] + [System.Text.Json.Serialization.JsonPropertyName("auth_type")] + public string? AuthType { get; set; } + + /// + /// 获取或设置会员卡 Code。 + /// + [Newtonsoft.Json.JsonProperty("code")] + [System.Text.Json.Serialization.JsonPropertyName("code")] + public string? CardCode { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/BusinessCircle/MallTransactionResource.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/BusinessCircle/MallTransactionResource.json index c4f64452..6e6c0024 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/BusinessCircle/MallTransactionResource.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/EventSamples/BusinessCircle/MallTransactionResource.json @@ -1,4 +1,4 @@ -{ +{ "mchid": "1230000109", "merchant_name": "腾讯广场", "shop_name": "微信支付", @@ -7,5 +7,7 @@ "openid": "oUpF8uMuAJ2pxb1Q9zNjWUHsd", "amount": 200, "time_end": "2020-05-20T13:29:35+08:00", - "transaction_id": "1234567890" + "transaction_id": "1234567890", + "code": "478515832665", + "auth_type": "REGISTERED_MODE" } diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/BusinessCircle/NotifyBusinessCirclePointsRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/BusinessCircle/NotifyBusinessCirclePointsRequest.json index 1095c77a..99aa81e8 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/BusinessCircle/NotifyBusinessCirclePointsRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/ModelSamples/BusinessCircle/NotifyBusinessCirclePointsRequest.json @@ -1,4 +1,4 @@ -{ +{ "sub_mchid": "1234567890", "transaction_id": "4200000533202000000000000000", "appid": "wx8828b70xxxxxxx8", @@ -6,5 +6,6 @@ "earn_points": true, "increased_points": 100, "points_update_time": "2020-05-20T13:29:35.120+08:00", + "no_points_remarks": "促销商品不参与积分活动", "total_points": 888888 }