ideship/track
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台

Browse Source
This commit is contained in:
李鹏军 2024-03-06 11:24:38 +08:00
commit a339608efb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SJZY.Track.Repository/Repositories/OrderRepository.cs
View File

@ -171,7 +171,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
{ {
pageList.List.ForEach(a => pageList.List.ForEach(a =>
{ {
var esDetails = esTrackDetails.Where(b => b.OrderId== a.Id).OrderByDescending(a => a.TrackTime); var esDetails = esTrackDetails.Where(b => b.OrderId== a.Id).OrderByDescending(b => b.TrackTime);
var trackDetail = esDetails.FirstOrDefault(); var trackDetail = esDetails.FirstOrDefault();
if (trackDetail!=null) if (trackDetail!=null)
{ {
@ -181,13 +181,13 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
} }
if (trackDetail.TrackEnContent!=a.NewestTrackEnContent) if (trackDetail.TrackEnContent!=a.NewestTrackEnContent)
{ {
a.NewestTrackContent=trackDetail.TrackEnContent; a.NewestTrackEnContent=trackDetail.TrackEnContent;
} }
if (trackDetail.TrackPlace!=a.NewestTrackPlace) if (trackDetail.TrackPlace!=a.NewestTrackPlace)
{ {
a.NewestTrackPlace=trackDetail.TrackPlace; a.NewestTrackPlace=trackDetail.TrackPlace;
} }
if (trackDetail.TrackTime!= trackDetail.TrackTime) if (trackDetail.TrackTime!= a.NewestTrackTime)
{ {
a.NewestTrackTime=trackDetail.TrackTime; a.NewestTrackTime=trackDetail.TrackTime;
} }