Merge remote-tracking branch 'origin/S06' into S06

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/BatchUpsertTrackInput.cs

@@ -73,16 +73,31 @@ public class BatchUpsertTrackInput : OrderNosInfo
     /// </summary>
     public string? TrackPlaceCity { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（省/州）
     /// </summary>
     public string? TrackPlaceProvince { get; set; }
 
+    /// <summary>
+    ///轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（国家/地区）
     /// </summary>
     public string? TrackPlaceNation { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; }
+
     /// <summary>
     /// 轨迹发生地邮编
     /// </summary>

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/UpsertTrackInput.cs

@@ -73,16 +73,31 @@ public class UpsertTrackInput : OrderNoInfo
     /// </summary>
     public string? TrackPlaceCity { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（省/州）
     /// </summary>
     public string? TrackPlaceProvince { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（国家/地区）
     /// </summary>
     public string? TrackPlaceNation { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; }
+
     /// <summary>
     /// 轨迹发生地邮编
     /// </summary>

src/SJZY.Track.Application.Contract/Events/TrackChangeEto.cs

@@ -94,16 +94,31 @@ public class TrackChangeEto
     /// </summary>
     public string? TrackPlaceCity { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（省/州）
     /// </summary>
     public string? TrackPlaceProvince { get; set; }
 
+    /// <summary>
+    ///轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（国家/地区）
     /// </summary>
     public string? TrackPlaceNation { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; }
+
     /// <summary>
     /// 轨迹发生地邮编
     /// </summary>

src/SJZY.Track.Application.Contract/Events/TrackUpsertEvent.cs

@@ -96,16 +96,31 @@ public class TrackUpsertEvent
     /// </summary>
     public string? TrackPlaceCity { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（省/州）
     /// </summary>
     public string? TrackPlaceProvince { get; set; }
 
+    /// <summary>
+    ///轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; }
+
     /// <summary>
     /// 轨迹发生地（国家/地区）
     /// </summary>
     public string? TrackPlaceNation { get; set; }
 
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; }
+
     /// <summary>
     /// 轨迹发生地邮编
     /// </summary>

src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs

@@ -74,8 +74,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             EstimatedDeliveryDate = eto.EstimatedDeliveryDate,
             TrackPlacePostcode = eto.TrackPlacePostcode,
             TrackPlaceNation = eto.TrackPlaceNation,
+            TrackPlaceNationId = eto.TrackPlaceNationId,
             TrackPlaceProvince = eto.TrackPlaceProvince,
+            TrackPlaceProvinceId = eto.TrackPlaceProvinceId,
             TrackPlaceCity = eto.TrackPlaceCity,
+            TrackPlaceCityId = eto.TrackPlaceCityId,
             Files = eto.Files,
             Remarks = eto.Remarks,
             Source = eto.Source,
@@ -390,8 +393,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                         FileName = x.FileName
                     }).ToList(),
                     TrackPlaceCity = @event.TrackPlaceCity ?? GlobalConst.EmptyString,
+                    TrackPlaceCityId = @event.TrackPlaceCityId ?? GlobalConst.NotExistId,
                     TrackPlaceProvince = @event.TrackPlaceProvince ?? GlobalConst.EmptyString,
+                    TrackPlaceProvinceId = @event.TrackPlaceProvinceId ?? GlobalConst.NotExistId,
                     TrackPlaceNation = @event.TrackPlaceNation ?? GlobalConst.EmptyString,
+                    TrackPlaceNationId = @event.TrackPlaceNationId ?? GlobalConst.NotExistId,
                     TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString,
                     DestinationTimeZone = @event.DestinationTimeZone,
                     EstimatedDeliveryDate = @event.EstimatedDeliveryDate,
@@ -425,8 +431,11 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
                     FileName = x.FileName
                 }).ToList();
                 track.TrackPlaceCity = @event.TrackPlaceCity ?? GlobalConst.EmptyString;
+                track.TrackPlaceCityId = @event.TrackPlaceCityId ?? GlobalConst.NotExistId;
                 track.TrackPlaceProvince = @event.TrackPlaceProvince ?? GlobalConst.EmptyString;
+                track.TrackPlaceProvinceId = @event.TrackPlaceProvinceId ?? GlobalConst.NotExistId;
                 track.TrackPlaceNation = @event.TrackPlaceNation ?? GlobalConst.EmptyString;
+                track.TrackPlaceNationId = @event.TrackPlaceNationId ?? GlobalConst.NotExistId;
                 track.TrackPlacePostcode = @event.TrackPlacePostcode ?? GlobalConst.EmptyString;
                 track.DestinationTimeZone = @event.DestinationTimeZone;
                 track.EstimatedDeliveryDate = @event.EstimatedDeliveryDate;

src/SJZY.Track.Application/Services/ProvideServices/TrackService.cs

@@ -360,8 +360,11 @@ public partial class TrackService : ApplicationService, ITrackService
                 Content = input.Content,
                 EnStatus = input.EnStatus,
                 TrackPlaceCity = input.TrackPlaceCity,
+                TrackPlaceCityId = input.TrackPlaceCityId,
                 TrackPlaceProvince = input.TrackPlaceProvince,
+                TrackPlaceProvinceId = input.TrackPlaceProvinceId,
                 TrackPlaceNation = input.TrackPlaceNation,
+                TrackPlaceNationId = input.TrackPlaceNationId,
                 TrackPlacePostcode = input.TrackPlacePostcode,
                 EstimatedDeliveryDate = input.EstimatedDeliveryDate,
                 DestinationTimeZone = input.DestinationTimeZone,

src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs

@@ -98,7 +98,7 @@ public class TrackOrderService : ApplicationService
             int hours = (int) x.TrackTimeZone; // 提取整数部分作为小时
             int minutes = (int) ((x.TrackTimeZone - hours) * 60); // 将小数部分乘以 60 转换为分钟
             x.TrackGTMTimeZone =
-                $"GTM {(x.TrackTimeZone >= 0 ? "+" : "-")}{new TimeSpan(hours, minutes, 0).ToString().RemovePostFix(":00")}";
+                $"GMT {(x.TrackTimeZone >= 0 ? "+" : "-")}{new TimeSpan(hours, minutes, 0).ToString().RemovePostFix(":00")}";
         });
 
         return res;
@@ -149,7 +149,7 @@ public class TrackOrderService : ApplicationService
         {
             if (a.TrackTimeZoneValue == 0f)
             {
-                a.TrackTimeZone = "GTM +00:00";
+                a.TrackTimeZone = "GMT +00:00";
             }
             else if (Math.Abs(a.TrackTimeZoneValue - GlobalConst.NoneTrackTimeZone) < 1)
             {
@@ -163,7 +163,7 @@ public class TrackOrderService : ApplicationService
                 var offset = new TimeSpan(hours, minutes, 0);
                 var timeZoneStr = offset.ToString();
                 var flag = a.TrackTimeZoneValue > 0f ? "+" : "";
-                a.TrackTimeZone = $"GTM {flag}{timeZoneStr.RemovePostFix(":00")}";
+                a.TrackTimeZone = $"GMT {flag}{timeZoneStr.RemovePostFix(":00")}";
             }
         });
         return list;

src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/TrackDetailsIndex.cs

@@ -135,22 +135,37 @@ public class TrackDetailsIndex : IdBaseIndex
     /// <summary>
     /// 轨迹发生地（城市）
     /// </summary>
-    public string? TrackPlaceCity { get; set; }
+    public string? TrackPlaceCity { get; set; } = GlobalConst.EmptyString;
+
+    /// <summary>
+    /// 轨迹发生地（城市）Id
+    /// </summary>
+    public int? TrackPlaceCityId { get; set; } = GlobalConst.NotExistId;
 
     /// <summary>
     /// 轨迹发生地（省/州）
     /// </summary>
-    public string? TrackPlaceProvince { get; set; }
+    public string? TrackPlaceProvince { get; set; } = GlobalConst.EmptyString;
+
+    /// <summary>
+    ///轨迹发生地（省/州）Id
+    /// </summary>
+    public int? TrackPlaceProvinceId { get; set; } = GlobalConst.NotExistId;
 
     /// <summary>
     /// 轨迹发生地（国家/地区）
     /// </summary>
-    public string? TrackPlaceNation { get; set; }
+    public string? TrackPlaceNation { get; set; } = GlobalConst.EmptyString;
+
+    /// <summary>
+    /// 轨迹发生地（国家/地区）Id
+    /// </summary>
+    public int? TrackPlaceNationId { get; set; } = GlobalConst.NotExistId;
 
     /// <summary>
     /// 轨迹发生地邮编
     /// </summary>
-    public string? TrackPlacePostcode { get; set; }
+    public string? TrackPlacePostcode { get; set; } = GlobalConst.EmptyString;
 
     /// <summary>
     /// 预计签收时间

src/SJZY.Track.Domain/Consts/GlobalConst.cs

@@ -7,6 +7,7 @@ public partial class GlobalConst
     public const int ChunkSize = 100;
     public const int SafelyLimit = 10000;
     public const int NormalLimit = 10000;
+    public const int NotExistId = -9999;
 
     public const float NoneTrackTimeZone = 99999;
 

src/SJZY.Track.Repository/Repositories/TrackDetailsEsRepository.cs

@@ -152,8 +152,11 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
                 track.Remarks,
                 track.Files,
                 track.TrackPlaceCity,
+                track.TrackPlaceCityId,
                 track.TrackPlaceProvince,
+                track.TrackPlaceProvinceId,
                 track.TrackPlaceNation,
+                track.TrackPlaceNationId,
                 track.TrackPlacePostcode,
                 track.DestinationTimeZone,
                 track.EstimatedDeliveryDate
@@ -192,8 +195,11 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
                     ctx._source.remarks = params.remarks;
                     ctx._source.files = params.files;
                     ctx._source.trackPlaceCity = params.trackPlaceCity;
+                    ctx._source.trackPlaceCityId = params.trackPlaceCityId;
                     ctx._source.trackPlaceProvince = params.trackPlaceProvince;
+                    ctx._source.trackPlaceProvinceId = params.trackPlaceProvinceId;
                     ctx._source.trackPlaceNation = params.trackPlaceNation;
+                    ctx._source.trackPlaceNationId = params.trackPlaceNationId;
                     ctx._source.trackPlacePostcode = params.trackPlacePostcode;
                     ctx._source.destinationTimeZone = params.destinationTimeZone;
                     ctx._source.estimatedDeliveryDate = params.estimatedDeliveryDate;
@@ -212,8 +218,11 @@ public class TrackDetailsEsRepository : ElasticSearchContextAbstract<TrackDetail
                         .Add("remarks", track.Remarks)
                         .Add("files", track.Files)
                         .Add("trackPlaceCity", track.TrackPlaceCity)
+                        .Add("trackPlaceCityId", track.TrackPlaceCityId)
                         .Add("trackPlaceProvince", track.TrackPlaceProvince)
+                        .Add("trackPlaceProvinceId", track.TrackPlaceProvinceId)
                         .Add("trackPlaceNation", track.TrackPlaceNation)
+                        .Add("trackPlaceNationId", track.TrackPlaceNationId)
                         .Add("trackPlacePostcode", track.TrackPlacePostcode)
                         .Add("destinationTimeZone", track.DestinationTimeZone)
                         .Add("estimatedDeliveryDate", track.EstimatedDeliveryDate)