From 8eca00c66bd185b1555a050ba5e0153095bddfd2 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 5 Mar 2024 16:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=98=8E=E7=BB=86es=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutoMapper/OrderAutoMapperProfile.cs        |  6 +++++-
 .../Repositories/TrackDetailsRepository.cs      | 17 +++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
index f79ef0b8..27f73eda 100644
--- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
@@ -21,6 +21,10 @@ public class OrderAutoMapperProfile : Profile
         CreateMap<GetPageTrackOrderInput, GetPageTrackOrderInputVO>(MemberList.None);
         CreateMap<TrackOrderVO, TrackOrderDto>(MemberList.None);
         CreateMap<UnifyPageResultDto<TrackOrderVO>, UnifyPageResultDto<TrackOrderDto>>(MemberList.None);
-        CreateMap<TrackDetailsIndex, TrackOrderDetailDto>(MemberList.None);
+        CreateMap<TrackDetailsIndex, TrackOrderDetailDto>(MemberList.None).ForMember(dest => dest.Id, opt => opt.MapFrom(m => m.OrderId))
+           .ForMember(dest => dest.Code, opt => opt.MapFrom(m => m.TrackCode))
+           .ForMember(dest => dest.Content, opt => opt.MapFrom(m => m.TrackContent))
+           .ForMember(dest => dest.EnContent, opt => opt.MapFrom(m => m.TrackEnContent))
+           .ForMember(dest => dest.TrackTimeZone, opt => opt.MapFrom(m => m.TraceTimeZone.ToString()));
     }
 }
\ No newline at end of file
diff --git a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
index a0e6cead..98a4d7d3 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
@@ -52,7 +52,7 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
             var r = await Context.UpdateAsync<TrackDetailsIndex>(index.Id, u => u
                     .Index(index.IndexName)
                     .Doc(index)
-                //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见
+            //.Refresh(Refresh.True) // 可选：立即刷新索引使更改立即可见
             );
 
             if (!r.IsValid)
@@ -89,19 +89,8 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
 
     public async Task<List<TrackDetailsIndex>?> GetListAsync(int orderId)
     {
-        var data = await Context.SearchAsync<TrackDetailsIndex>(x => x
-            .Source(s => s.Includes(fd => fd
-                .Field(f => f.TrackStatus)
-                .Field(f => f.TrackCode)
-                .Field(f => f.TrackContent)
-                .Field(f => f.TrackPlace)
-                .Field(f => f.TrackTime)
-                .Field(f => f.TraceTimeZone)
-            )).Query(q =>
-                q.Terms(t => t.Field(f => f.OrderId).Terms(orderId))
-                && q.Term(t => t.Field(f => f.IsDeleted).Value(false))
-            )
-        );
+        var data = await Context.SearchAsync<TrackDetailsIndex>(x => x.Query(q => q.Term(t => t.OrderId, orderId)).Size(1000)
+                   .Sort(s => s.Field(f => f.TrackTime, SortOrder.Descending)));
 
         return data?.Documents?.ToList();
     }