diff --git a/src/SJZY.Track.Application/SJZY.Track.Application.csproj b/src/SJZY.Track.Application/SJZY.Track.Application.csproj index 35e87215..67055e65 100644 --- a/src/SJZY.Track.Application/SJZY.Track.Application.csproj +++ b/src/SJZY.Track.Application/SJZY.Track.Application.csproj @@ -9,6 +9,7 @@ + @@ -19,7 +20,6 @@ - diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs index 52a2885f..a8614eca 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.Link.cs @@ -69,7 +69,8 @@ public partial class OrderService // 查询存在的订单 var existedOrders = await _orderRepository.GetListAsync(x => - x.OrderType == input.LinkOrderType && noLinkOrderNos.Contains(x.OrderNo), + x.SubSystemId == input.SubSystemId && x.OrderType == input.LinkOrderType && + noLinkOrderNos.Contains(x.OrderNo), x => new { x.Id, diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs index bf4f95ff..5ce6f798 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackPushService.cs @@ -90,6 +90,14 @@ public class TrackPushService : ApplicationService, ITrackPushService return $"即将推送轨迹代码{input.TrackCode}给{orders.Length}个订单"; } + + /// + /// 获取轨迹推送内容 + /// + /// + /// + /// + [HttpPost("Track/GetTrackPushContentList")] public async Task> GetTrackPushContentListAsync(int subSystemId, int customerId) { var list = await _trackPushConfigRepository.GetTrackPushContentListAsync(subSystemId, customerId);