Merge remote-tracking branch 'origin/S03-轨迹中台优化项' into test

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

@@ -236,12 +236,13 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
     public async Task DeleteTrackAsync(int[] orderIds, List<string> trackCodes)
     {
         var r = await Context.DeleteByQueryAsync<TrackDetailsIndex>(x => x
-            .Conflicts(Conflicts.Proceed)
+            .Conflicts(Conflicts.Abort)
             .Query(
                 q =>
                     q.Terms(t => t.Field(f => f.OrderId).Terms(orderIds))
                     && q.Term(t => t.IsCanDelete, true)
                     && q.Terms(t => t.Field(f => f.TrackCode.Suffix("keyword")).Terms(trackCodes)))
+            .WaitForCompletion()
         );
 
         if (!r.IsValid)