Merge branch 'refs/heads/S06' into test

src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs

@@ -32,6 +32,11 @@ public class GetAvailableContentOutput
     /// </summary>
     public int? Source { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地
+    /// </summary>
+    public string? TrackPlace { get; set; }
+
     /// <summary>
     /// 轨迹发生时间
     /// </summary>
@@ -41,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; }
 }

src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs

@@ -262,17 +262,17 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
             //S06新增
             IsVisibility = false,
             Source = (int)TrackSourceEnum.ExternalServiceProvide,
-            Remarks = GlobalConst.EmptyString,
+            Remarks = null,
             Files = null,
-            Content = GlobalConst.EmptyString,
-            EnStatus = GlobalConst.EmptyString,
-            TrackPlaceCity = GlobalConst.EmptyString,
-            TrackPlaceCityId = GlobalConst.NotExistId,
-            TrackPlaceProvince = GlobalConst.EmptyString,
-            TrackPlaceProvinceId = GlobalConst.NotExistId,
-            TrackPlaceNation = GlobalConst.EmptyString,
-            TrackPlaceNationId = GlobalConst.NotExistId,
-            TrackPlacePostcode = GlobalConst.EmptyString,
+            Content = null,
+            EnStatus = null,
+            TrackPlaceCity = null,
+            TrackPlaceCityId = null,
+            TrackPlaceProvince = null,
+            TrackPlaceProvinceId = null,
+            TrackPlaceNation = null,
+            TrackPlaceNationId = null,
+            TrackPlacePostcode = null,
             DestinationTimeZone = null,
             EstimatedDeliveryDate = null,
         };
@@ -307,15 +307,15 @@ public class TrackRefreshEventHandler : ITransientDependency, IRabbitHandler
             //S06新增轨迹明细字段
             IsVisibility = false,
             Source = (int) TrackSourceEnum.ExternalServiceProvide,
-            Remarks = GlobalConst.EmptyString,
+            Remarks = null,
             Files = null,
-            TrackPlaceCity = GlobalConst.EmptyString,
-            TrackPlaceCityId = GlobalConst.NotExistId,
-            TrackPlaceProvince = GlobalConst.EmptyString,
-            TrackPlaceProvinceId = GlobalConst.NotExistId,
-            TrackPlaceNation = GlobalConst.EmptyString,
-            TrackPlaceNationId = GlobalConst.NotExistId,
-            TrackPlacePostcode = GlobalConst.EmptyString,
+            TrackPlaceCity = null,
+            TrackPlaceCityId = null,
+            TrackPlaceProvince = null,
+            TrackPlaceProvinceId = null,
+            TrackPlaceNation =null,
+            TrackPlaceNationId = null,
+            TrackPlacePostcode = null,
             DestinationTimeZone = null,
             EstimatedDeliveryDate = null,
         };

src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs

@@ -307,9 +307,23 @@ public class TrackContentService : ApplicationService
                     EnContent = matchItem.TrackEnContent,
                     Content = matchItem.TrackContent,
                     Code = matchItem.TrackCode,
+                    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);
         }