This commit is contained in:
李鹏军 2024-03-06 14:21:30 +08:00
parent a127285d18
commit e2a34ede15
2 changed files with 7 additions and 5 deletions

View File

@ -33,7 +33,12 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
[CapSubscribe(GlobalConst.TrackUpsertSubscribe)] [CapSubscribe(GlobalConst.TrackUpsertSubscribe)]
public async Task ConsumerAsync(TrackUpsertEvent @event) public async Task ConsumerAsync(TrackUpsertEvent @event)
{ {
if (@event.Visited.Contains(@event.OrderId)) return; if (@event.Visited.Contains(@event.OrderId))
{
LogHelper.Error($"轨迹订单循环依赖预警:{@event.Visited.JoinAsString(",")}");
return;
}
@event.Visited.Add(@event.OrderId); @event.Visited.Add(@event.OrderId);
// 不同子系统需要做内容映射 // 不同子系统需要做内容映射
@ -45,7 +50,6 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
if (mapCode == default) if (mapCode == default)
{ {
LogHelper.Error($"轨迹订单循环依赖预警:{@event.Visited.JoinAsString(",")}");
return; return;
} }

View File

@ -1,6 +1,5 @@
using SJZY.Track.Domain.Aggregates.OrderAggregate; using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Aggregates.TrackContentAggregate; using SJZY.Track.Domain.Aggregates.TrackContentAggregate;
using SJZY.Track.Domain.Aggregates.TrackFlagAggregate;
using SJZY.Track.Domain.Aggregates.TrackPullAggregate; using SJZY.Track.Domain.Aggregates.TrackPullAggregate;
using SJZY.Track.Domain.Aggregates.TrackStatusAggregate; using SJZY.Track.Domain.Aggregates.TrackStatusAggregate;
using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate; using SJZY.Track.Domain.Aggregates.TrackTemplateAggregate;
@ -69,9 +68,8 @@ public class ProvideQueries : ISugarRepository, IProvideQueries,
.LeftJoin<TrackTemplateContentEntity>((x, a) => x.TrackTemplateId == a.TrackTemplateId) .LeftJoin<TrackTemplateContentEntity>((x, a) => x.TrackTemplateId == a.TrackTemplateId)
.LeftJoin<TrackContentEntity>((x, a, b) => a.TrackContentId == b.Id) .LeftJoin<TrackContentEntity>((x, a, b) => a.TrackContentId == b.Id)
.LeftJoin<TrackStatusEntity>((x, a, b, c) => b.TrackStatusId == c.Id) .LeftJoin<TrackStatusEntity>((x, a, b, c) => b.TrackStatusId == c.Id)
.LeftJoin<TrackFlagEntity>((x, a, b, c, d) => b.TrackFlagId == d.Id)
.Where((x, a, b) => x.OrderId == orderId && b.Code == code) .Where((x, a, b) => x.OrderId == orderId && b.Code == code)
.Select((x, a, b, c, d) => new MatchTrackContentDto .Select((x, a, b, c) => new MatchTrackContentDto
{ {
Content = b.Content, Content = b.Content,
EnContent = b.EnContent, EnContent = b.EnContent,