From 04183298e05ac27952dfee8735cb63ab899aa1b1 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 10 Jan 2022 11:37:14 +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=E7=89=A9=E6=B5=81=E5=8A=A9=E6=89=8B=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 --- .../CgibinExpressBusinessOrderAddRequest.cs | 47 +++++++++++++++++-- .../CgibinExpressBusinessOrderGetRequest.cs | 7 +++ .../CgibinExpressBusinessOrderAddRequest.json | 17 ++++++- .../CgibinExpressBusinessOrderGetRequest.json | 3 +- 4 files changed, 68 insertions(+), 6 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.cs index 4099cc00..c62f4858 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.cs @@ -154,6 +154,33 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models public class Shop { + public static class Types + { + public class GoodsDetail + { + /// + /// 获取或设置商品名。 + /// + [Newtonsoft.Json.JsonProperty("goods_name")] + [System.Text.Json.Serialization.JsonPropertyName("goods_name")] + public string? Name { get; set; } + + /// + /// 获取或设置商品缩略图 URL。 + /// + [Newtonsoft.Json.JsonProperty("img_url")] + [System.Text.Json.Serialization.JsonPropertyName("img_url")] + public string? ImageUrl { get; set; } + + /// + /// 获取或设置商品详情描述。 + /// + [Newtonsoft.Json.JsonProperty("goods_desc")] + [System.Text.Json.Serialization.JsonPropertyName("goods_desc")] + public string? Description { get; set; } + } + } + /// /// 获取或设置商家小程序的路径。 /// @@ -166,21 +193,28 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models /// [Newtonsoft.Json.JsonProperty("img_url")] [System.Text.Json.Serialization.JsonPropertyName("img_url")] - public string ImageUrl { get; set; } = string.Empty; + public string? ImageUrl { get; set; } /// /// 获取或设置商品名称。 /// [Newtonsoft.Json.JsonProperty("goods_name")] [System.Text.Json.Serialization.JsonPropertyName("goods_name")] - public string GoodsName { get; set; } = string.Empty; + public string? GoodsName { get; set; } /// /// 获取或设置商品数量。 /// [Newtonsoft.Json.JsonProperty("goods_count")] [System.Text.Json.Serialization.JsonPropertyName("goods_count")] - public int GoodsCount { get; set; } + public int? GoodsCount { get; set; } + + /// + /// 获取或设置商品详情列表。 + /// + [Newtonsoft.Json.JsonProperty("detail_list")] + [System.Text.Json.Serialization.JsonPropertyName("detail_list")] + public IList? GoodsDetailList { get; set; } } public class Insurance @@ -324,5 +358,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [Newtonsoft.Json.JsonProperty("expect_time")] [System.Text.Json.Serialization.JsonPropertyName("expect_time")] public long? ExpectedTimestamp { get; set; } + + /// + /// 获取或设置分单策略。 + /// + [Newtonsoft.Json.JsonProperty("take_mode")] + [System.Text.Json.Serialization.JsonPropertyName("take_mode")] + public int? TakeMode { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.cs index 4c6639da..d05dc8c7 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.cs @@ -35,5 +35,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [Newtonsoft.Json.JsonProperty("waybill_id")] [System.Text.Json.Serialization.JsonPropertyName("waybill_id")] public string? WaybillId { get; set; } + + /// + /// 获取或设置打印面单类型。 + /// + [Newtonsoft.Json.JsonProperty("print_type")] + [System.Text.Json.Serialization.JsonPropertyName("print_type")] + public int? PrintType { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.json index a6b01f9f..01e4d542 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderAddRequest.json @@ -33,7 +33,19 @@ "wxa_path": "/index/index?from=waybill&id=01234567890123456789", "img_url": "https://mmbiz.qpic.cn/mmbiz_png/OiaFLUqewuIDNQnTiaCInIG8ibdosYHhQHPbXJUrqYSNIcBL60vo4LIjlcoNG1QPkeH5GWWEB41Ny895CokeAah8A/640", "goods_name": "微信气泡狗抱枕&微信气泡狗钥匙扣", - "goods_count": 2 + "goods_count": 2, + "detail_list": [ + { + "goods_name": "微信气泡狗抱枕（小号）", + "goods_img_url": "https://mmbiz.qpic.cn/mmbiz_png/OiaFLUqewuIDNQnTiaCInIG8ibdosYHhQHPbXJUrqYSNIcBL60vo4LIjlcoNG1QPkeH5GWWEB41Ny895CokeAah8A/640", + "goods_desc": "40cm * 40cm尺寸" + }, + { + "goods_name": "微信气泡狗抱枕（中号）", + "goods_img_url": "https://mmbiz.qpic.cn/mmbiz_png/OiaFLUqewuIDNQnTiaCInIG8ibdosYHhQHPbXJUrqYSNIcBL60vo4LIjlcoNG1QPkeH5GWWEB41Ny895CokeAah8A/640", + "goods_desc": "50cm * 50cm尺寸" + } + ] }, "cargo": { "count": 2, @@ -59,5 +71,6 @@ "service": { "service_type": 0, "service_name": "标准快递" - } + }, + "take_mode": 0 } \ No newline at end of file diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.json index 18fa41ed..56d38c2b 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/CgibinExpress/Business/CgibinExpressBusinessOrderGetRequest.json @@ -2,5 +2,6 @@ "order_id": "01234567890123456789", "openid": "oABC123456", "delivery_id": "SF", - "waybill_id": "123456789" + "waybill_id": "123456789", + "print_type": 1 } \ No newline at end of file