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

change：轨迹代码为--的不参与计算

Browse Source
This commit is contained in:
李鹏军 2024-04-15 14:09:12 +08:00
parent d95c5da96b
commit a28a9ac5db
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SJZY.Track.Application/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -60,9 +60,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
}).ToArray(); }).ToArray();
nextEvent.TrackRefreshData = new TrackRefreshStruct nextEvent.TrackRefreshData = new TrackRefreshStruct
{ {
ServiceProviderName = @event.TrackRefreshData.ServiceProviderName ?? GlobalConst.EmptyString, ServiceProviderName = @event.TrackRefreshData.ServiceProviderName,
OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString, OriginTrackContent = @event.TrackRefreshData.OriginTrackContent,
OriginTrackData = @event.TrackRefreshData.OriginTrackData ?? GlobalConst.EmptyString, OriginTrackData = @event.TrackRefreshData.OriginTrackData,
// tips：一定要重置为false，父级订单的完成不会使得关联订单完成，关联单也必须由刷新来完成或手动设置完成！！ // tips：一定要重置为false，父级订单的完成不会使得关联订单完成，关联单也必须由刷新来完成或手动设置完成！！
IsCompleted = false IsCompleted = false
}; };
@ -118,9 +118,9 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
TrackPlace = @event.TrackPlace, TrackPlace = @event.TrackPlace,
TrackTime = @event.TrackTime, TrackTime = @event.TrackTime,
TrackTimeZone = @event.TrackTimeZone, TrackTimeZone = @event.TrackTimeZone,
ServiceProviderName = @event.TrackRefreshData.ServiceProviderName, ServiceProviderName = @event.TrackRefreshData.ServiceProviderName ?? GlobalConst.EmptyString,
OriginTrackContent = @event.TrackRefreshData.OriginTrackContent, OriginTrackContent = @event.TrackRefreshData.OriginTrackContent ?? GlobalConst.EmptyString,
OriginTrackData = @event.TrackRefreshData.OriginTrackData, OriginTrackData = @event.TrackRefreshData.OriginTrackData ?? GlobalConst.EmptyString,
IsCanDelete = false, IsCanDelete = false,
CreateUser = @event.OperationMan ?? GlobalConst.SystemUser, CreateUser = @event.OperationMan ?? GlobalConst.SystemUser,
CreateTime = DateTime.Now CreateTime = DateTime.Now

31
src/SJZY.Track.Repository/Repositories/TrackDetailsRepository.cs
View File

@ -2,7 +2,6 @@ using Nest;
using SJZY.Expand.ABP.Core.Logger; using SJZY.Expand.ABP.Core.Logger;
using SJZY.Expand.ElasticSearch.Services; using SJZY.Expand.ElasticSearch.Services;
using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate; using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
using SJZY.Track.Domain.Consts;
using SJZY.Track.Domain.Dtos.TrackDetails; using SJZY.Track.Domain.Dtos.TrackDetails;
namespace SJZY.Track.Repository.Repositories; namespace SJZY.Track.Repository.Repositories;
@ -18,12 +17,13 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
{ {
var r = await Context.SearchAsync<TrackDetailsIndex>(s => s var r = await Context.SearchAsync<TrackDetailsIndex>(s => s
.Source() .Source()
.Query(q => .Query(q => q
q.Terms(t => t .Bool(b => b
.Field(f => f.OrderId) .Must(
.Terms(orderIds)) mu => mu.Terms(t => t.Field(f => f.OrderId).Terms(orderIds)),
&& q.Term(f => f.TrackCode.Suffix("keyword"), trackCode) mu => mu.Term(t => t.Field(f => f.TrackCode.Suffix("keyword")).Value(trackCode))
&& q.Term(f => f.ServiceProviderName.Suffix("keyword"), GlobalConst.EmptyString) )
)
) )
); );
@ -41,11 +41,18 @@ internal class TrackDetailsRepository : ElasticSearchContextAbstract<TrackDetail
.Field(f => f.TrackTimeZone) .Field(f => f.TrackTimeZone)
.Field(f => f.OrderId) .Field(f => f.OrderId)
)) ))
.Query(q => .Query(q => q
q.Terms(t => t .Bool(b => b
.Field(f => f.OrderId) .Must(
.Terms(orderIds)) mu => mu.Terms(t => t.Field(f => f.OrderId).Terms(orderIds))
&& q.Term(f => f.ServiceProviderName.Suffix("keyword"), GlobalConst.EmptyString) )
.MustNot(mn => mn
.Term(t => t
.Field(f => f.TrackCode.Suffix("keyword"))
.Value("--")
)
)
)
) )
.Sort(s => s.Field(f => f.TrackTime, SortOrder.Descending)) .Sort(s => s.Field(f => f.TrackTime, SortOrder.Descending))
.Size(1) .Size(1)