diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs index ffb67836..a021cd41 100644 --- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs +++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs @@ -72,52 +72,6 @@ public class OrderService : ApplicationService return true; } - #region 轨迹订单明细 - - /// - /// 根据轨迹订单id获取轨迹订单明细列表 - /// - /// - /// - [HttpPost("/Order/GetDetails")] - public async Task> GetOrderDetails(GetOrderDetailsInput input) - { - var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId); - if (!trackDetails.IsNullOrEmpty()) - { - var list = ObjectMapper.Map, List>(trackDetails); - int id = 1; - list.ForEach(a => - { - a.Id = id++; - }); - return list; - } - - return new List(); - } - - #endregion - - #region 轨迹订单列表 - - /// - /// 获取分页的轨迹订单 - /// - /// - /// - [HttpPost("/Order/GetTrackOrderList")] - public async Task> GetPageTrackOrder(GetPageTrackOrderInput input) - { - var vo = ObjectMapper.Map(input); - var pageList = await _orderRepository.GetPageTrackOrder(vo); - var pageResultDto = - ObjectMapper.Map, UnifyPageResultDto>(pageList); - return pageResultDto; - } - - #endregion - private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order) { order = ObjectMapper.Map(input, order); diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs index 2f04bb41..587ba728 100644 --- a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs +++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs @@ -57,13 +57,12 @@ namespace SJZY.Track.Application.Services.TrackOrders list.ForEach(a => { a.Id = id++; - var trackContent = trackContents.FirstOrDefault(a => a.SubSystemId==input.SubSystemId&& a.TrackCode==a.TrackCode); + var trackContent = trackContents.FirstOrDefault(b => b.SubSystemId==input.SubSystemId&& b.TrackCode==a.Code); if (trackContent!=null) { a.IsCanDelete=trackContent.IsCanDelete; a.IsExternal = trackContent.IsExternal; } - //a.TrackTimeZoneValue=8f; if (a.TrackTimeZoneValue==0) { a.TrackTimeZone=$"GTM{" "}+00:00";