From 9a968901c60e16b89aedeecfe000e11c8dea9dc8 Mon Sep 17 00:00:00 2001 From: Eamon Date: Thu, 19 Oct 2023 15:53:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20GoodLifeFulfilmentCertificatePrepare?= =?UTF-8?q?V1Response=20=E6=8C=892023-09-12=E6=96=87=E6=A1=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=88todo:=20time=5Fcard=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eFulfilmentCertificatePrepareV1Response.cs | 68 +++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs index 486adbe8..46f7c73a 100644 --- a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs +++ b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs @@ -20,37 +20,51 @@ public class Amount /// /// 获取或设置券原始金额（单位：分）。 /// - [Newtonsoft.Json.JsonProperty("original")] - [System.Text.Json.Serialization.JsonPropertyName("original")] + [Newtonsoft.Json.JsonProperty("original_amount")] + [System.Text.Json.Serialization.JsonPropertyName("original_amount")] public int OriginalAmount { get; set; } + /// + /// 券划线价金额，单位分。 + /// + [Newtonsoft.Json.JsonProperty("list_market_amount")] + [System.Text.Json.Serialization.JsonPropertyName("list_market_amount")] + public int ListMarketAmount { get; set; } + /// /// 获取或设置用户实付金额（单位：分）。 /// - [Newtonsoft.Json.JsonProperty("pay")] - [System.Text.Json.Serialization.JsonPropertyName("pay")] + [Newtonsoft.Json.JsonProperty("pay_amount")] + [System.Text.Json.Serialization.JsonPropertyName("pay_amount")] public int PayAmount { get; set; } /// - /// 获取或设置券实付金额（单位：分）。 + /// 券实付金额（=用户实付金额+支付优惠金额），单位分 /// - [Newtonsoft.Json.JsonProperty("coupon_pay")] - [System.Text.Json.Serialization.JsonPropertyName("coupon_pay")] + [Newtonsoft.Json.JsonProperty("coupon_pay_amount")] + [System.Text.Json.Serialization.JsonPropertyName("coupon_pay_amount")] public int CouponPayAmount { get; set; } /// /// 获取或设置商家营销金额（单位：分）。 /// - [Newtonsoft.Json.JsonProperty("merchant_ticket")] - [System.Text.Json.Serialization.JsonPropertyName("merchant_ticket")] + [Newtonsoft.Json.JsonProperty("merchant_ticket_amount")] + [System.Text.Json.Serialization.JsonPropertyName("merchant_ticket_amount")] public int MerchantTicketAmount { get; set; } /// /// 获取或设置支付优惠金额（单位：分）。 /// - [Newtonsoft.Json.JsonProperty("payment_discount")] - [System.Text.Json.Serialization.JsonPropertyName("payment_discount")] + [Newtonsoft.Json.JsonProperty("payment_discount_amount")] + [System.Text.Json.Serialization.JsonPropertyName("payment_discount_amount")] public int PaymentDiscountAmount { get; set; } + + /// + /// 平台优惠金额，单位分。 + /// + [Newtonsoft.Json.JsonProperty("platform_discount_amount")] + [System.Text.Json.Serialization.JsonPropertyName("platform_discount_amount")] + public int PlatformDiscountAmount { get; set; } } public class SKU @@ -70,7 +84,7 @@ public class SKU public string Title { get; set; } = default!; /// - /// 获取或设置团购类型。 + /// 获取或设置团购类型（type=1团餐券; type=2代金券; type=3次卡）。 /// [Newtonsoft.Json.JsonProperty("groupon_type")] [System.Text.Json.Serialization.JsonPropertyName("groupon_type")] @@ -96,9 +110,23 @@ public class SKU [Newtonsoft.Json.JsonProperty("third_sku_id")] [System.Text.Json.Serialization.JsonPropertyName("third_sku_id")] public string? OutSKUId { get; set; } + + /// + /// 商家团购账号id。 + /// + [Newtonsoft.Json.JsonProperty("account_id")] + [System.Text.Json.Serialization.JsonPropertyName("account_id")] + public string? AccountId { get; set; } } } + /// + /// 券id。 + /// + [Newtonsoft.Json.JsonProperty("certificate_id")] + [System.Text.Json.Serialization.JsonPropertyName("certificate_id")] + public string CertificateId { get; set; } = default!; + /// /// 获取或设置加密券码。 /// @@ -107,12 +135,19 @@ public class SKU public string EncryptedCode { get; set; } = default!; /// - /// 获取或设置券码有效期时间戳。 + /// 券码有效期，开始时间，时间戳，单位秒。 /// [Newtonsoft.Json.JsonProperty("expire_time")] [System.Text.Json.Serialization.JsonPropertyName("expire_time")] public long ExpireTimestamp { get; set; } + /// + /// 券码有效期，开始时间，时间戳，单位秒。 + /// + [Newtonsoft.Json.JsonProperty("start_time")] + [System.Text.Json.Serialization.JsonPropertyName("start_time")] + public long StartTimestamp { get; set; } + /// /// 获取或设置金额信息。 /// @@ -136,6 +171,13 @@ public class SKU [System.Text.Json.Serialization.JsonPropertyName("verify_token")] public string VerifyToken { get; set; } = default!; + /// + /// 抖音订单id + /// + [Newtonsoft.Json.JsonProperty("order_id")] + [System.Text.Json.Serialization.JsonPropertyName("order_id")] + public string OrderId { get; set; } = default!; + /// /// 获取或设置可用团购券列表。 /// From 5fc131e64c04517421ade2b49f7f8e5267b61a05 Mon Sep 17 00:00:00 2001 From: Eamon Date: Thu, 19 Oct 2023 16:34:12 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=AE=98=E6=96=B9=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E9=87=8C=E7=9A=84CertificateId=E7=B1=BB=E5=9E=8B=E6=98=AFstrin?= =?UTF-8?q?g=EF=BC=8C=E5=AE=9E=E9=99=85=E6=98=AFnumber?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...GoodLifeFulfilmentCertificatePrepareV1Response.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs index 46f7c73a..43c364ab 100644 --- a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs +++ b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs @@ -120,12 +120,12 @@ public class SKU } } - /// - /// 券id。 - /// - [Newtonsoft.Json.JsonProperty("certificate_id")] - [System.Text.Json.Serialization.JsonPropertyName("certificate_id")] - public string CertificateId { get; set; } = default!; + ///// + ///// 券id。 + ///// + //[Newtonsoft.Json.JsonProperty("certificate_id")] + //[System.Text.Json.Serialization.JsonPropertyName("certificate_id")] + //public long CertificateId { get; set; } = default!; /// /// 获取或设置加密券码。 From de22486ad9a2a615ef114c8afd3573bdefb03029 Mon Sep 17 00:00:00 2001 From: Eamon Date: Fri, 20 Oct 2023 01:43:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs index 7bd66a9b..4bce3341 100644 --- a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs +++ b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs @@ -13,7 +13,7 @@ public class GoodLifeGoodsProductOnlineQueryV1Request : DouyinOpenRequest public string? AccountId { get; set; } /// - /// 获取或设置上线状态。 + /// 获取或设置上线状态。过滤在线状态 1-在线 2-下线 3-封禁 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] @@ -27,7 +27,7 @@ public class GoodLifeGoodsProductOnlineQueryV1Request : DouyinOpenRequest public int? PageCursor { get; set; } /// - /// 获取或设置分页每页数量。 + /// 获取或设置分页每页数量。分页数量，不传默认为5，最大上限50 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] From 2b07d8a7afada7ede6b222d8cf2fffa37cd3e639 Mon Sep 17 00:00:00 2001 From: RHQYZ Date: Thu, 26 Oct 2023 16:43:49 +0800 Subject: [PATCH 4/5] Update GoodLifeFulfilmentCertificatePrepareV1Response.cs --- ...ifeFulfilmentCertificatePrepareV1Response.cs | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs index 43c364ab..08ae4a92 100644 --- a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs +++ b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Fulfilment/Certificate/GoodLifeFulfilmentCertificatePrepareV1Response.cs @@ -25,7 +25,7 @@ public class Amount public int OriginalAmount { get; set; } /// - /// 券划线价金额，单位分。 + /// 获取或设置券划线价金额（单位：分）。 /// [Newtonsoft.Json.JsonProperty("list_market_amount")] [System.Text.Json.Serialization.JsonPropertyName("list_market_amount")] @@ -39,7 +39,7 @@ public class Amount public int PayAmount { get; set; } /// - /// 券实付金额（=用户实付金额+支付优惠金额），单位分 + /// 获取或设置券实付金额（单位：分） /// [Newtonsoft.Json.JsonProperty("coupon_pay_amount")] [System.Text.Json.Serialization.JsonPropertyName("coupon_pay_amount")] @@ -60,7 +60,7 @@ public class Amount public int PaymentDiscountAmount { get; set; } /// - /// 平台优惠金额，单位分。 + /// 获取或设置平台优惠金额（单位：分）。 /// [Newtonsoft.Json.JsonProperty("platform_discount_amount")] [System.Text.Json.Serialization.JsonPropertyName("platform_discount_amount")] @@ -112,7 +112,7 @@ public class SKU public string? OutSKUId { get; set; } /// - /// 商家团购账号id。 + /// 获取或设置券商家团购账号 ID。 /// [Newtonsoft.Json.JsonProperty("account_id")] [System.Text.Json.Serialization.JsonPropertyName("account_id")] @@ -120,13 +120,6 @@ public class SKU } } - ///// - ///// 券id。 - ///// - //[Newtonsoft.Json.JsonProperty("certificate_id")] - //[System.Text.Json.Serialization.JsonPropertyName("certificate_id")] - //public long CertificateId { get; set; } = default!; - /// /// 获取或设置加密券码。 /// @@ -172,7 +165,7 @@ public class SKU public string VerifyToken { get; set; } = default!; /// - /// 抖音订单id + /// 获取或设置抖音订单 ID。 /// [Newtonsoft.Json.JsonProperty("order_id")] [System.Text.Json.Serialization.JsonPropertyName("order_id")] From d10d9b22578e4126c1418e15d361103448d2ca7e Mon Sep 17 00:00:00 2001 From: RHQYZ Date: Thu, 26 Oct 2023 16:44:43 +0800 Subject: [PATCH 5/5] Update GoodLifeGoodsProductOnlineQueryV1Request.cs --- .../Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs index 4bce3341..7bd66a9b 100644 --- a/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs +++ b/src/SKIT.FlurlHttpClient.ByteDance.DouyinOpen/Models/GoodLife/Goods/Product/GoodLifeGoodsProductOnlineQueryV1Request.cs @@ -13,7 +13,7 @@ public class GoodLifeGoodsProductOnlineQueryV1Request : DouyinOpenRequest public string? AccountId { get; set; } /// - /// 获取或设置上线状态。过滤在线状态 1-在线 2-下线 3-封禁 + /// 获取或设置上线状态。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore] @@ -27,7 +27,7 @@ public class GoodLifeGoodsProductOnlineQueryV1Request : DouyinOpenRequest public int? PageCursor { get; set; } /// - /// 获取或设置分页每页数量。分页数量，不传默认为5，最大上限50 + /// 获取或设置分页每页数量。 /// [Newtonsoft.Json.JsonIgnore] [System.Text.Json.Serialization.JsonIgnore]