diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
index f1c9300c..e2331257 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackContents/GetAvailableContentOutput.cs
@@ -32,6 +32,11 @@ public class GetAvailableContentOutput
///
public int? Source { get; set; }
+ ///
+ /// 轨迹发生地
+ ///
+ public string? TrackPlace { get; set; }
+
///
/// 轨迹发生时间
///
@@ -41,4 +46,52 @@ public class GetAvailableContentOutput
/// 轨迹发生时区
///
public float? TrackTimeZone { get; set; }
+
+ ///
+ /// 轨迹发生地
+ ///
+ public string? TrackPlace { get; set; }
+
+ ///
+ /// 时区的值
+ ///
+ public float? TrackTimeZoneValue { get; set; }
+
+ ///
+ /// 备注
+ ///
+ public string? Remarks { get; set; }
+
+ ///
+ /// 轨迹发生地(城市)
+ ///
+ public string? TrackPlaceCity { get; set; }
+ public int? TrackPlaceCityId { get; set; }
+
+ ///
+ /// 轨迹发生地(省/州)
+ ///
+ public string? TrackPlaceProvince { get; set; }
+ public int? TrackPlaceProvinceId { get; set; }
+
+ ///
+ /// 轨迹发生地(国家/地区)
+ ///
+ public string? TrackPlaceNation { get; set; }
+ public int? TrackPlaceNationId { get; set; }
+
+ ///
+ /// 轨迹发生地邮编
+ ///
+ public string? TrackPlacePostcode { get; set; }
+
+ ///
+ /// 预计到达时间
+ ///
+ public DateTime? EstimatedDeliveryDate { get; set; }
+
+ ///
+ /// 目的地时区
+ ///
+ public float? DestinationTimeZone { get; set; }
}
diff --git a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs b/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
index 25367043..36baaec7 100644
--- a/src/SJZY.Track.Application/Rabbit/TrackRefreshEventHandler.cs
+++ b/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,
};
diff --git a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
index 4aa023da..37089d50 100644
--- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
+++ b/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);
}