Merge remote-tracking branch 'origin/S01-轨迹中台' into S01-轨迹中台

src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs

@@ -72,52 +72,6 @@ public class OrderService : ApplicationService
         return true;
     }
 
-    #region 轨迹订单明细
-
-    /// <summary>
-    /// 根据轨迹订单id获取轨迹订单明细列表
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/Order/GetDetails")]
-    public async Task<List<TrackOrderDetailDto>> GetOrderDetails(GetOrderDetailsInput input)
-    {
-        var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId);
-        if (!trackDetails.IsNullOrEmpty())
-        {
-            var list = ObjectMapper.Map<List<TrackDetailsIndex>, List<TrackOrderDetailDto>>(trackDetails);
-            int id = 1;
-            list.ForEach(a =>
-            {
-                a.Id = id++;
-            });
-            return list;
-        }
-
-        return new List<TrackOrderDetailDto>();
-    }
-
-    #endregion
-
-    #region 轨迹订单列表
-
-    /// <summary>
-    /// 获取分页的轨迹订单
-    /// </summary>
-    /// <param name="input"></param>
-    /// <returns></returns>
-    [HttpPost("/Order/GetTrackOrderList")]
-    public async Task<UnifyPageResultDto<TrackOrderDto>> GetPageTrackOrder(GetPageTrackOrderInput input)
-    {
-        var vo = ObjectMapper.Map<GetPageTrackOrderInput, GetPageTrackOrderInputVO>(input);
-        var pageList = await _orderRepository.GetPageTrackOrder(vo);
-        var pageResultDto =
-            ObjectMapper.Map<UnifyPageResultDto<TrackOrderVO>, UnifyPageResultDto<TrackOrderDto>>(pageList);
-        return pageResultDto;
-    }
-
-    #endregion
-
     private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order)
     {
         order = ObjectMapper.Map(input, order);

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";