From 030f016c2da3743533e775da84f1245e32f0dc3b Mon Sep 17 00:00:00 2001
From: eli <xumengen_eli@online.com>
Date: Sat, 23 Nov 2024 09:52:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=8F=AF=E7=94=A8=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9=E8=8A=82=E7=82=B9=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GetAvailableContentOutput.cs              | 48 +++++++++++++++++++
 .../TrackContents/TrackContentService.cs      | 15 +++++-
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
index ddbd0a48..e2331257 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
@@ -46,4 +46,52 @@ public class GetAvailableContentOutput
     /// 轨迹发生时区
     /// </summary>
     public float? TrackTimeZone { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地
+    /// </summary>
+    public string? TrackPlace { get; set; }
+
+    /// <summary>
+    /// 时区的值
+    /// </summary>
+    public float? TrackTimeZoneValue { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? Remarks { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（城市）
+    /// </summary>
+    public string? TrackPlaceCity { get; set; }
+    public int? TrackPlaceCityId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（省/州）
+    /// </summary>
+    public string? TrackPlaceProvince { get; set; }
+    public int? TrackPlaceProvinceId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地（国家/地区）
+    /// </summary>
+    public string? TrackPlaceNation { get; set; }
+    public int? TrackPlaceNationId { get; set; }
+
+    /// <summary>
+    /// 轨迹发生地邮编
+    /// </summary>
+    public string? TrackPlacePostcode { get; set; }
+
+    /// <summary>
+    /// 预计到达时间
+    /// </summary>
+    public DateTime? EstimatedDeliveryDate { get; set; }
+
+    /// <summary>
+    /// 目的地时区
+    /// </summary>
+    public float? DestinationTimeZone { get; set; }
 }
diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
index 5e75ffa8..37089d50 100644
--- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
+++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
@@ -310,7 +310,20 @@ public class TrackContentService : ApplicationService
                     TrackPlace = matchItem.TrackPlace,
                     TrackTime = matchItem.TrackTime,
                     TrackTimeZone = matchItem.TrackTimeZone,
-                    Source = matchItem.Source
+                    Source = matchItem.Source,
+
+                    DestinationTimeZone = matchItem.DestinationTimeZone,
+                    EstimatedDeliveryDate = matchItem.EstimatedDeliveryDate,
+                    TrackPlacePostcode = matchItem.TrackPlacePostcode,
+                    TrackPlaceNation = matchItem.TrackPlaceNation,
+                    TrackPlaceNationId = matchItem.TrackPlaceNationId,
+                    TrackPlaceProvince = matchItem.TrackPlaceProvince,
+                    TrackPlaceProvinceId = matchItem.TrackPlaceProvinceId,
+                    TrackPlaceCity = matchItem.TrackPlaceCity,
+                    TrackPlaceCityId = matchItem.TrackPlaceCityId,
+                    Remarks = matchItem.Remarks,
+                    TrackTimeZoneValue = matchItem.DestinationTimeZone,
+                    TrackPlace = matchItem.TrackPlace,
                 });
             matchContent.AddRange(match);
         }