From 7769d6cf8074f22a2091f88936b990ce40c30a0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=86=9B?= <2357729423@qq.com>
Date: Tue, 16 Apr 2024 14:33:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=BD=A8=E8=BF=B9=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=88=B0=E6=9C=8D=E5=8A=A1=E5=95=86=E8=BD=A8=E8=BF=B9?=
 =?UTF-8?q?=E5=8D=95=E6=9D=A1=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrackInsertForNotMappedEventHandler.cs     |  4 ++--
 .../EventHandlers/TrackUpsertEventHandler.cs   |  1 -
 .../ITrackDetailsRepository.cs                 |  1 +
 .../Repositories/TrackDetailsRepository.cs     | 18 +++++++++++++++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/SJZY.Track.Application/EventHandlers/TrackInsertForNotMappedEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackInsertForNotMappedEventHandler.cs
index a0df5114..9bd76c5e 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackInsertForNotMappedEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackInsertForNotMappedEventHandler.cs
@@ -20,7 +20,7 @@ public class TrackInsertForNotMappedEventHandler : ITransientDependency, ICapSub
     {
         if (await _trackDetailsRepository.AnyAsync(@event.OrderId, @event.TrackTime))
         {
-            return; // 无法映射的轨迹只做新增
+            return;
         }
 
         // 新增服务商轨迹到es
@@ -45,6 +45,6 @@ public class TrackInsertForNotMappedEventHandler : ITransientDependency, ICapSub
         track.TrackEnContent = GlobalConst.EmptyString;
         track.ZeroTrackTime = track.TrackTime.Subtract(TimeSpan.FromHours(track.TrackTimeZone));
 
-        await _trackDetailsRepository.UpdateAsync(track);
+        await _trackDetailsRepository.AddAsync(track);
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
index 8059fcf6..8fdc61bc 100644
--- a/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
+++ b/src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
@@ -109,7 +109,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
             {
                 track = new TrackDetailsIndex
                 {
-                    IndexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}",
                     OrderId = order.OrderId,
                     OrderNo = order.OrderNo,
                     OrderType = order.OrderType,
diff --git a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs
index f44f298f..a61e4f95 100644
--- a/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/TrackDetailsAggregate/ITrackDetailsRepository.cs
@@ -17,6 +17,7 @@ public interface ITrackDetailsRepository
 
     Task AddManyAsync(List<TrackDetailsIndex> index);
 
+    Task AddAsync(TrackDetailsIndex track);
 
     Task<List<TrackDetailsIndex>> GetListAsync(int orderType, List<string> orderNos);
 
diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
index 75ecc85a..3d88e56b 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
@@ -120,7 +120,10 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
     public async Task AddManyAsync(List<TrackDetailsIndex> tracks)
     {
         // 按天写入es
-        var r = await Context.IndexManyAsync(tracks, tracks.First().IndexName);
+        var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}";
+        tracks.ForEach(x => x.IndexName = indexName);
+
+        var r = await Context.IndexManyAsync(tracks, indexName);
 
         if (!r.IsValid)
         {
@@ -128,6 +131,19 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
         }
     }
 
+    public async Task AddAsync(TrackDetailsIndex track)
+    {
+        // 按天写入es
+        var indexName = $"{GlobalConst.TrackIndex}-{DateTime.Now:yyyy.MM.dd}";
+        track.IndexName = indexName;
+        var r = await Context.IndexAsync(track, s => s.Index(indexName));
+
+        if (!r.IsValid)
+        {
+            throw new Exception($"轨迹新增失败，原因：{r.DebugInformation}。");
+        }
+    }
+
     public async Task<List<TrackDetailsIndex>> GetListAsync(int orderType, List<string> orderNos)
     {
         if (orderNos.Count < 1) return new List<TrackDetailsIndex>();