From 2263398e4b4dd5c6b53946d5f665de18fc93eed7 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Sun, 10 Apr 2022 21:50:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(wxapi):=20=E9=9A=8F=E5=AE=98=E6=96=B9?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=AA=E5=AE=9A=E4=B9=89=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BC=98=E6=83=A0=E5=88=B8=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=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 --- .../Coupon/ProductCouponCreateRequest.cs | 7 ++++ .../Shop/Coupon/ShopCouponGetResponse.cs | 33 ++++++++++++++++++- .../Shop/Coupon/ShopCouponAddRequest.json | 5 +-- .../Coupon/ShopCouponGetListResponse.json | 16 +++++++-- .../Shop/Coupon/ShopCouponGetResponse.json | 6 ++-- .../Shop/Coupon/ShopCouponUpdateRequest.json | 1 + 6 files changed, 60 insertions(+), 8 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Product/Coupon/ProductCouponCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Product/Coupon/ProductCouponCreateRequest.cs index b5e034bf..09d8f971 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Product/Coupon/ProductCouponCreateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Product/Coupon/ProductCouponCreateRequest.cs @@ -155,6 +155,13 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [System.Text.Json.Serialization.JsonPropertyName("valid_day_num")] public int? ValidDays { get; set; } + /// + /// 获取或设置相对生效秒数。 + /// + [Newtonsoft.Json.JsonProperty("valid_second")] + [System.Text.Json.Serialization.JsonPropertyName("valid_second")] + public int? ValidSeconds { get; set; } + /// /// 获取或设置绝对生效开始时间戳。 /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Shop/Coupon/ShopCouponGetResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Shop/Coupon/ShopCouponGetResponse.cs index b377d24c..11e63f33 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Shop/Coupon/ShopCouponGetResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Shop/Coupon/ShopCouponGetResponse.cs @@ -212,6 +212,13 @@ [System.Text.Json.Serialization.JsonPropertyName("valid_day_num")] public int? ValidDays { get; set; } + /// + /// 获取或设置相对生效秒数。 + /// + [Newtonsoft.Json.JsonProperty("valid_second")] + [System.Text.Json.Serialization.JsonPropertyName("valid_second")] + public int? ValidSeconds { get; set; } + /// /// 获取或设置绝对生效开始时间戳。 /// @@ -226,6 +233,16 @@ [System.Text.Json.Serialization.JsonPropertyName("end_time")] public long? EndTimestamp { get; set; } } + + public class Extra + { + /// + /// 获取或设置有效期时间戳。 + /// + [Newtonsoft.Json.JsonProperty("valid_time")] + [System.Text.Json.Serialization.JsonPropertyName("valid_time")] + public long? ValidTimestamp { get; set; } + } } /// @@ -261,7 +278,14 @@ /// [Newtonsoft.Json.JsonProperty("valid_info")] [System.Text.Json.Serialization.JsonPropertyName("valid_info")] - public Types.Validity Validity { get; set; } = default!; + public Types.Validity? Validity { get; set; } + + /// + /// 获取或设置优惠券扩展信息。 + /// + [Newtonsoft.Json.JsonProperty("ext_info")] + [System.Text.Json.Serialization.JsonPropertyName("ext_info")] + public Types.Extra? Extra { get; set; } } } @@ -272,6 +296,13 @@ [System.Text.Json.Serialization.JsonPropertyName("out_coupon_id")] public string OutCouponId { get; set; } = default!; + /// + /// 获取或设置小程序 AppId。 + /// + [Newtonsoft.Json.JsonProperty("appid")] + [System.Text.Json.Serialization.JsonPropertyName("appid")] + public string? AppId { get; set; } + /// /// 获取或设置优惠券类型。 /// diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponAddRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponAddRequest.json index e85fbb7c..a837c921 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponAddRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponAddRequest.json @@ -42,8 +42,9 @@ "valid_info": { "valid_type": 1, "valid_day_num": 10, - "start_time": "1625451250", - "end_time": "1625464250" + "valid_second": 3600, + "start_time": 1625451250, + "end_time": 1625464250 } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetListResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetListResponse.json index cd6d8c3a..7d2e044c 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetListResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetListResponse.json @@ -15,11 +15,15 @@ }, "receive_info": { "total_num": 100 + }, + "ext_info": { + "valid_time": 1625226181 } }, "status": 0, "create_time": 1625218450, - "update_time": 1625238573 + "update_time": 1625238573, + "appid": "wx9e20708660a0991b" }, "coupon_stock": { "out_coupon_id": "out_coupon_id_3", @@ -48,7 +52,8 @@ }, "status": 1, "create_time": 1625239595, - "update_time": 1625239595 + "update_time": 1625239595, + "appid": "wx9e20708660a0991b" } }, { @@ -92,13 +97,18 @@ "valid_info": { "valid_type": 1, "valid_day_num": 10, + "valid_second": 3600, "start_time": 1625451250, "end_time": 1625464250 + }, + "ext_info": { + "valid_time": 1625473652 } }, "status": 2, "create_time": 1625454641, - "update_time": 1625473652 + "update_time": 1625473652, + "appid": "wx9e20708660a0991b" }, "coupon_stock": { "out_coupon_id": "coupon_id_1", diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetResponse.json index 3f22c212..fb608674 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponGetResponse.json @@ -26,7 +26,7 @@ "buy_out_product_id": "product_id_1", "buy_product_cnt": 3, "get_out_product_id": "product_id_2", - "get_product_cnt": 2131241242 + "get_product_cnt": 5 } }, "discount_num": 9800, @@ -41,13 +41,15 @@ "valid_info": { "valid_type": 1, "valid_day_num": 10, + "valid_second": 3600, "start_time": 1625451250, "end_time": 1625464250 } }, "status": 1, "create_time": 1625454641, - "update_time": 1625454641 + "update_time": 1625454641, + "appid": "wx9e20708660a0991b" } } } \ No newline at end of file diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponUpdateRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponUpdateRequest.json index 63af756d..f51e60c5 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponUpdateRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Shop/Coupon/ShopCouponUpdateRequest.json @@ -39,6 +39,7 @@ "valid_info": { "valid_type": 1, "valid_day_num": 10, + "valid_second": 3600, "start_time": 1625451250, "end_time": 1625464250 }