From 7fba3a4f21e5fac5e9ec036b3385ca0d46840f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=BE=99=20=E7=8E=8B?= <w15604079545@outlook.com>
Date: Fri, 22 Nov 2024 17:59:30 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E8=B0=83=E6=95=B4=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9F=A5=E8=AF=A2=E5=8F=8D=E5=8F=82=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=A8=E8=BF=B9=E5=8F=91=E7=94=9F=E5=9C=B0?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=20fix:=20=E4=BF=AE=E5=A4=8D=E5=BC=95?=
 =?UTF-8?q?=E5=8F=91=E8=BD=A8=E8=BF=B9=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=A1=AB=E5=85=85=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=E3=80=90=E8=BD=A8=E8=BF=B9=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E3=80=91=E3=80=90=E8=BD=A8=E8=BF=B9=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E3=80=91=E6=98=BE=E7=A4=BA=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Rabbit/TrackRefreshEventHandler.cs        | 36 +++++++++----------
 .../TrackContents/TrackContentService.cs      |  1 +
 2 files changed, 19 insertions(+), 18 deletions(-)

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..5e75ffa8 100644
--- a/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
+++ b/src/SJZY.Track.Application/Services/TrackContents/TrackContentService.cs
@@ -307,6 +307,7 @@ 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