From 97cc657825f3148aef55bd67db2f945b8c333dd8 Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 7 Apr 2025 19:45:10 +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=E5=BE=AE=E4=BF=A1=E5=B0=8F=E5=BA=97=E7=94=B5?= =?UTF-8?q?=E5=AD=90=E9=9D=A2=E5=8D=95=E5=8F=96=E5=8F=B7=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...lsECLogisticsEWaybillOrderCreateRequest.cs | 93 +++++++++++++++++++ ...sECLogisticsEWaybillOrderCreateResponse.cs | 87 +++++++++++++++++ ...CLogisticsEWaybillOrderCreateResponse.json | 14 ++- 3 files changed, 193 insertions(+), 1 deletion(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateRequest.cs index 70e82d95..dbf4eb8f 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateRequest.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateRequest.cs @@ -118,6 +118,92 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [System.Text.Json.Serialization.JsonExtensionData] public IDictionary? ExtensionData { get; set; } } + + public class DeliveryInfo + { + public static class Types + { + public class SubPackage + { + /// + /// 获取或设置重量（单位：克）。 + /// + [Newtonsoft.Json.JsonProperty("weight_g")] + [System.Text.Json.Serialization.JsonPropertyName("weight_g")] + public int? Weight { get; set; } + + /// + /// 获取或设置长度（单位：厘米）。 + /// + [Newtonsoft.Json.JsonProperty("space_x")] + [System.Text.Json.Serialization.JsonPropertyName("space_x")] + public int? Length { get; set; } + + /// + /// 获取或设置宽度（单位：厘米）。 + /// + [Newtonsoft.Json.JsonProperty("space_y")] + [System.Text.Json.Serialization.JsonPropertyName("space_y")] + public int? Width { get; set; } + + /// + /// 获取或设置高度（单位：厘米）。 + /// + [Newtonsoft.Json.JsonProperty("space_z")] + [System.Text.Json.Serialization.JsonPropertyName("space_z")] + public int? Height { get; set; } + + /// + /// 获取或设置包裹编号。 + /// + [Newtonsoft.Json.JsonProperty("package_no")] + [System.Text.Json.Serialization.JsonPropertyName("package_no")] + public string? PackageNumber { get; set; } + } + } + + /// + /// 获取或设置发货方式。 + /// + [Newtonsoft.Json.JsonProperty("delivery_type")] + [System.Text.Json.Serialization.JsonPropertyName("delivery_type")] + public int? DeliveryType { get; set; } + + /// + /// 获取或设置预约上门开始时间戳。 + /// + [Newtonsoft.Json.JsonProperty("collected_time_begin")] + [System.Text.Json.Serialization.JsonPropertyName("collected_time_begin")] + public long? CollectedBeginTimestamp { get; set; } + + /// + /// 获取或设置预约上门结束时间戳。 + /// + [Newtonsoft.Json.JsonProperty("collected_time_end")] + [System.Text.Json.Serialization.JsonPropertyName("collected_time_end")] + public long? CollectedEndTimestamp { get; set; } + + /// + /// 获取或设置子母件包裹数量。 + /// + [Newtonsoft.Json.JsonProperty("package_quantity")] + [System.Text.Json.Serialization.JsonPropertyName("package_quantity")] + public int? PackageQuantity { get; set; } + + /// + /// 获取或设置子件列表。 + /// + [Newtonsoft.Json.JsonProperty("subpackage_list")] + [System.Text.Json.Serialization.JsonPropertyName("subpackage_list")] + public IList? SubPackageList { get; set; } + + /// + /// 获取或设置商家额外信息。 + /// + [Newtonsoft.Json.JsonProperty("merchant_ext_info")] + [System.Text.Json.Serialization.JsonPropertyName("merchant_ext_info")] + public string? MerchantExtraInfo { get; set; } + } } /// @@ -217,5 +303,12 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [Newtonsoft.Json.JsonProperty("ext_info")] [System.Text.Json.Serialization.JsonPropertyName("ext_info")] public Types.EWaybillExtra? EWaybillExtra { get; set; } + + /// + /// 获取或设置发货信息。 + /// + [Newtonsoft.Json.JsonProperty("delivery_info")] + [System.Text.Json.Serialization.JsonPropertyName("delivery_info")] + public Types.DeliveryInfo? DeliveryInfo { get; set; } } } diff --git a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.cs index 464622b0..627a5fd9 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.Api/Models/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.cs @@ -5,6 +5,79 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models /// public class ChannelsECLogisticsEWaybillOrderCreateResponse : WechatApiResponse { + public static class Types + { + public class SubWaybill + { + /// + /// 获取或设置快递单号类型。 + /// + [Newtonsoft.Json.JsonProperty("waybill_type")] + [System.Text.Json.Serialization.JsonPropertyName("waybill_type")] + public int? WaybillType { get; set; } + + /// + /// 获取或设置快递单号。 + /// + [Newtonsoft.Json.JsonProperty("waybill_id")] + [System.Text.Json.Serialization.JsonPropertyName("waybill_id")] + public string? WaybillId { get; set; } + + /// + /// 获取或设置创建时间戳。 + /// + [Newtonsoft.Json.JsonProperty("create_time")] + [System.Text.Json.Serialization.JsonPropertyName("create_time")] + public long CreateTimestamp { get; set; } + } + + public class RiskInfo + { + public static class Types + { + public class Order + { + /// + /// 获取或设置订单 ID。 + /// + [Newtonsoft.Json.JsonProperty("ec_order_id")] + [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.Common.NumericalStringReadOnlyConverter))] + [System.Text.Json.Serialization.JsonPropertyName("ec_order_id")] + [System.Text.Json.Serialization.JsonConverter(typeof(System.Text.Json.Serialization.Common.NumericalStringReadOnlyConverter))] + public string OrderId { get; set; } = default!; + + /// + /// 获取或设置代发的订单密文。 + /// + [Newtonsoft.Json.JsonProperty("ewaybill_order_code")] + [System.Text.Json.Serialization.JsonPropertyName("ewaybill_order_code")] + public string? EWaybillOrderCode { get; set; } + + /// + /// 获取或设置代发的订单所属店铺 AppId。 + /// + [Newtonsoft.Json.JsonProperty("ewaybill_order_appid")] + [System.Text.Json.Serialization.JsonPropertyName("ewaybill_order_appid")] + public string? EWaybillOrderAppId { get; set; } + } + } + + /// + /// 获取或设置风险信息内容。 + /// + [Newtonsoft.Json.JsonProperty("risk_msg")] + [System.Text.Json.Serialization.JsonPropertyName("risk_msg")] + public string? RiskMessage { get; set; } + + /// + /// 获取或设置疑似存在风险的订单目录。 + /// + [Newtonsoft.Json.JsonProperty("risk_ec_order_info")] + [System.Text.Json.Serialization.JsonPropertyName("risk_ec_order_info")] + public Types.Order[]? OrderList { get; set; } + } + } + /// /// 获取或设置电子面单 ID。 /// @@ -32,5 +105,19 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Models [Newtonsoft.Json.JsonProperty("print_info")] [System.Text.Json.Serialization.JsonPropertyName("print_info")] public string? PrintInfo { get; set; } + + /// + /// 获取或设置子单列表。 + /// + [Newtonsoft.Json.JsonProperty("waybill_id_list")] + [System.Text.Json.Serialization.JsonPropertyName("waybill_id_list")] + public Types.SubWaybill[]? SubWaybillList { get; set; } + + /// + /// 获取或设置疑似风险信息。 + /// + [Newtonsoft.Json.JsonProperty("order_risk_info")] + [System.Text.Json.Serialization.JsonPropertyName("order_risk_info")] + public Types.RiskInfo? RiskInfo { get; set; } } } diff --git a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.json b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.json index 15793c74..5f63a2f9 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.Api.UnitTests/ModelSamples/Channels/ECLogistics/EWaybill/Order/ChannelsECLogisticsEWaybillOrderCreateResponse.json @@ -3,5 +3,17 @@ "errmsg": "ok", "ewaybill_order_id": "111", "waybill_id": "1212xzcxz", - "delivery_error_msg": "xxxx" + "delivery_error_msg": "xxxx", + "waybill_id_list": [ + { + "waybill_id": "xxxxxx", + "waybill_type": 1, + "create_time": 1732515904 + }, + { + "waybill_id": "xxxxxx", + "waybill_type": 2, + "create_time": 1732515904 + } + ] }