diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs index ae47f35a..a527dd47 100644 --- a/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs +++ b/src/SJZY.Track.Application.Contract/Dtos/TrackPull/TrackRefreshAttach.cs @@ -2,10 +2,10 @@ public class TrackRefreshAttach { - public TrackRefreshAttach(int serviceProviderId, string serviceProviderCode, int subSystemId, int orderType) + public TrackRefreshAttach(int serviceProviderId, string serviceProviderName, int subSystemId, int orderType) { ServiceProviderId = serviceProviderId; - ServiceProviderCode = serviceProviderCode; + ServiceProviderName = serviceProviderName; SubSystemId = subSystemId; OrderType = orderType; } @@ -16,9 +16,9 @@ public class TrackRefreshAttach public int ServiceProviderId { get; set; } /// - /// 服务商code + /// 服务商name /// - public string ServiceProviderCode { get; set; } + public string ServiceProviderName { get; set; } /// /// 订单类型(主数据枚举TrackOrderType) diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs index f5856f91..71245edf 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPullService.cs @@ -51,18 +51,21 @@ public class TrackPullService : ApplicationService throw new BusinessException(message: "一个能更新的都没有"); } - foreach (var group in orders.GroupBy(x => - new TrackRefreshAttach(x.ServiceProviderId, x.ServiceProviderCode, x.SubSystemId, x.OrderType))) + + foreach (var group in orders.GroupBy(x => new + { x.ServiceProviderId, x.ServiceProviderName, x.SubSystemId, x.OrderType })) { var data = group.Select(x => new { x.OrderNo }).ToList(); + var serviceProviderCode = group.FirstOrDefault()!.ServiceProviderCode; // 批量获取轨迹 await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( - "A012", group.Key.ServiceProviderCode, data, - GlobalConst.TrackRefreshSubscribe, JsonConvert.SerializeObject(group.Key)); + "A012", serviceProviderCode, data, GlobalConst.TrackRefreshSubscribe, + JsonConvert.SerializeObject(new TrackRefreshAttach(group.Key.ServiceProviderId, + group.Key.ServiceProviderName, group.Key.SubSystemId, group.Key.OrderType))); } return true; @@ -87,6 +90,7 @@ public class TrackPullService : ApplicationService var orders = await _provideQueries.FindOrderWithServiceProviderAsync(config.ServiceProviderId); var serviceProviderCode = orders.FirstOrDefault()?.ServiceProviderCode; + var serviceProviderName = orders.FirstOrDefault()?.ServiceProviderName; foreach (var group in orders.GroupBy(x => new { x.SubSystemId, x.OrderType })) @@ -100,7 +104,7 @@ public class TrackPullService : ApplicationService await _httpClientProxy.Service.BatchForwardThenPushToQueueAsync( InterfaceRelayConst.GetTrackInterfaceCode, serviceProviderCode, data, GlobalConst.TrackRefreshSubscribe, - JsonConvert.SerializeObject(new TrackRefreshAttach(config.ServiceProviderId, serviceProviderCode!, + JsonConvert.SerializeObject(new TrackRefreshAttach(config.ServiceProviderId, serviceProviderName!, group.Key.SubSystemId, group.Key.OrderType))); } diff --git a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs index df193e03..a5c9ad32 100644 --- a/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs +++ b/src/SJZY.Track.Domain/Dtos/Order/OrderWithServiceProviderVO.cs @@ -16,6 +16,11 @@ public class OrderWithServiceProviderVO /// public string ServiceProviderCode { get; set; } = null!; + /// + /// 服务商name + /// + public string ServiceProviderName { get; set; } = null!; + /// /// 子系统id /// diff --git a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs index 5bf07b06..483cd181 100644 --- a/src/SJZY.Track.Repository/Queries/ProvideQueries.cs +++ b/src/SJZY.Track.Repository/Queries/ProvideQueries.cs @@ -120,6 +120,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, OrderType = a.OrderType, ServiceProviderId = b.ServiceProviderId, ServiceProviderCode = c.Code, + ServiceProviderName = c.Name, SubSystemId = a.SubSystemId }) .ToListAsync(); @@ -137,6 +138,7 @@ public class ProvideQueries : ISugarRepository, IProvideQueries, OrderType = a.OrderType, ServiceProviderId = b.ServiceProviderId, ServiceProviderCode = c.Code, + ServiceProviderName = c.Name, SubSystemId = a.SubSystemId }) .ToListAsync();