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

Merge branch 'S07' into test

Browse Source
This commit is contained in:
hardstylewyl 2025-04-16 14:45:15 +08:00
commit 0508ecce9a
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SJZY.Track.Application/CAP/EventHandlers/TrackPushEventHandler.cs
View File

@ -550,11 +550,10 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
//轨迹推送失败(被拦截) //轨迹推送失败(被拦截)
private void TrackPushFailedPublicTopic(string failedMessage, TrackPushEvent @event, OrderEntity order) private void TrackPushFailedPublicTopic(string failedMessage, TrackPushEvent @event, OrderEntity order)
{ {
using var activity = ActivityHelper.CreateSpanActivity("TrackPushEventHandler"); using var activity = ActivityHelper.CreateSpanActivity("TrackPushFailedPublicTopic");
activity.SetTag("TrackPushFailedPublicTopic", failedMessage);
activity.SetTag("failedMessage", failedMessage); activity.SetTag("failedMessage", failedMessage);
activity.SetTag("@event", @event); activity.SetTag("order", order.ToJson());
activity.SetTag("order", order); activity.SetTag("@event", @event.ToJson());
_broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto _broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto
{ {
SubSystemCode = @event.SubSystemCode, SubSystemCode = @event.SubSystemCode,
@ -587,10 +586,9 @@ public class TrackPushEventHandler : ITransientDependency, ICapSubscribe
List<dynamic> pushOrUpdateInputs List<dynamic> pushOrUpdateInputs
) )
{ {
using var activity = ActivityHelper.CreateSpanActivity("TrackPushEventHandler"); using var activity = ActivityHelper.CreateSpanActivity("TrackPushFailedPublicTopic");
activity.SetTag("TrackPushFailedPublicTopic", failedMessage); activity.SetTag("failedMessage", failedMessage.ToJson());
activity.SetTag("failedMessage", failedMessage); activity.SetTag("@event", @event.ToJson());
activity.SetTag("@event", @event);
foreach (var pushInput in pushOrUpdateInputs) foreach (var pushInput in pushOrUpdateInputs)
{ {
_broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto _broadcastingService.TrackPushFailedPubilcTopic(new TrackPushRecordDto

11
src/SJZY.Track.Application/CAP/EventHandlers/TrackUpsertEventHandler.cs
View File

@ -308,14 +308,15 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
// 修改了extra，要校验修改后的extra是否存在 // 修改了extra，要校验修改后的extra是否存在
|| (!string.IsNullOrWhiteSpace(@event.NewExtra) && x.Extra == @event.NewExtra)).ToList(); || (!string.IsNullOrWhiteSpace(@event.NewExtra) && x.Extra == @event.NewExtra)).ToList();
using var activity = ActivityHelper.CreateSpanActivity("TrackUpsertEventHandler"); using var activity = ActivityHelper.CreateSpanActivity("TrackUpsertEventHandler.UpsertTrackAsync");
if (@event.IsAdd) if (@event.IsAdd)
{ {
if (existTracks.Count > 0) if (existTracks.Count > 0)
{ {
_logger.LogInformation("订单已经存在不允许重复的轨迹，不允许重复添加：{@event}", @event); _logger.LogInformation("订单已经存在不允许重复的轨迹，不允许重复添加：{@event}", @event);
activity.SetTag("errorMsg", "订单已经存在不允许重复的轨迹，不允许重复添加"); activity.SetTag("errorMsg", "订单已经存在不允许重复的轨迹，不允许重复添加");
activity.SetTag("@event", @event); activity.SetTag("order", order.ToJson());
activity.SetTag("@event", @event.ToJson());
continue; continue;
} }
@ -328,7 +329,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
{ {
_logger.LogInformation("订单不存在轨迹，不允许修改：{@event}", @event); _logger.LogInformation("订单不存在轨迹，不允许修改：{@event}", @event);
activity.SetTag("errorMsg", "订单不存在轨迹，不允许修改"); activity.SetTag("errorMsg", "订单不存在轨迹，不允许修改");
activity.SetTag("@event", @event); activity.SetTag("order", order.ToJson());
activity.SetTag("@event", @event.ToJson());
continue; continue;
} }
@ -336,7 +338,8 @@ public class TrackUpsertEventHandler : ITransientDependency, ICapSubscribe
{ {
_logger.LogInformation("订单存在多条轨迹不允许修改：{@event}", @event); _logger.LogInformation("订单存在多条轨迹不允许修改：{@event}", @event);
activity.SetTag("errorMsg", "订单存在多条轨迹不允许修改"); activity.SetTag("errorMsg", "订单存在多条轨迹不允许修改");
activity.SetTag("@event", @event); activity.SetTag("order", order.ToJson());
activity.SetTag("@event", @event.ToJson());
continue; continue;
} }

2
src/SJZY.Track.Application/Rabbit/TrackPushCompletedEventHandler.cs
View File

@ -201,7 +201,7 @@ public class TrackPushCompletedEventHandler : ITransientDependency, IRabbitHandl
OperationMan = log.CreateUser, OperationMan = log.CreateUser,
PushTime = DateTime.Now, PushTime = DateTime.Now,
OptionType = log.OptionType, OptionType = log.OptionType,
IsManualPush = !string.Equals(log.CreateUser, GlobalConst.SystemUser), //操作人不为系统用户，则认为是仍推送 IsManualPush = !string.Equals(log.CreateUser, GlobalConst.SystemUser), //操作人不为系统用户，则认为是人推送
PushContent = log.PushContent, PushContent = log.PushContent,
OrderNo = log.OrderNo, OrderNo = log.OrderNo,
TrackStatus = log.TrackStatus, TrackStatus = log.TrackStatus,