From 9ba82664803c3574118e707a6e85e2a51feac894 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Mon, 4 Mar 2024 18:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A8=E8=BF=B9=E6=A8=A1=E7=89=88=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E5=AD=90=E7=B3=BB=E7=BB=9Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dtos/TrackTemplates/GetTrackDetailDto.cs  |  5 +++
 .../Services/ProvideServices/OrderService.cs  |  2 -
 .../ProvideServices/TrackQueryService.cs      | 42 +++++++++++++++++++
 .../TrackTemplate/GetTrackTemplateDetailVO.cs |  5 +++
 .../Repositories/TrackTemplateRepository.cs   |  3 +-
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs
index 86e5db45..08f7824d 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/TrackTemplates/GetTrackDetailDto.cs
@@ -56,6 +56,11 @@
         /// </summary>
         public string SubSystem { set; get; }
 
+        /// <summary>
+        /// 子系统id
+        /// </summary>
+        public int SubSystemId { set; get; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
index 007e06d0..aaf59008 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
@@ -94,7 +94,6 @@ public class OrderService : ApplicationService
     #endregion
 
     #region 轨迹订单列表
-
     /// <summary>
     /// 获取分页的轨迹订单
     /// </summary>
@@ -109,7 +108,6 @@ public class OrderService : ApplicationService
             ObjectMapper.Map<UnifyPageResultDto<TrackOrderVO>, UnifyPageResultDto<TrackOrderDto>>(pageList);
         return pageResultDto;
     }
-
     #endregion
 
     private async Task UpdateOrderAsync(UpdateOrderInput input, OrderEntity order)
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
index 02f6d9b0..aa554a9a 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
@@ -1,5 +1,7 @@
 using SJZY.Track.Application.Contract.Dtos.ProvideServices;
+using SJZY.Track.Domain.Aggregates.OrderAggregate;
 using SJZY.Track.Domain.Aggregates.TrackDetailsAggregate;
+using SJZY.Track.Domain.Dtos.Order;
 using SJZY.Track.Domain.Queries;
 
 namespace SJZY.Track.Application.Services.ProvideServices;
@@ -11,12 +13,15 @@ namespace SJZY.Track.Application.Services.ProvideServices;
 public class TrackQueryService : ApplicationService
 {
     private readonly ITrackDetailsRepository _trackDetailsRepository;
+    private readonly IOrderRepository _orderRepository;
     private readonly IProvideQueries _provideQueries;
 
     public TrackQueryService(ITrackDetailsRepository trackDetailsRepository,
+        IOrderRepository orderRepository,
         IProvideQueries provideQueries)
     {
         _trackDetailsRepository = trackDetailsRepository;
+        _orderRepository=orderRepository;
         _provideQueries = provideQueries;
     }
 
@@ -63,6 +68,43 @@ public class TrackQueryService : ApplicationService
         return res;
     }
 
+    #region 轨迹订单明细列表
+    /// <summary>
+    /// 根据轨迹订单id获取轨迹订单明细列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("/Track/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);
+            return list;
+        }
+
+        return new List<TrackOrderDetailDto>();
+    }
+    #endregion
+
+    #region  轨迹订单分页
+    /// <summary>
+    /// 获取分页的轨迹订单
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost("/Track/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 TrackDetailSort(List<GetTrackOutput> list, GetTrackInput input)
     {
         switch (input.SortMethod)
diff --git a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
index 1fa28d92..46677e0e 100644
--- a/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
+++ b/src/SJZY.Track.Domain/Dtos/TrackTemplate/GetTrackTemplateDetailVO.cs
@@ -56,6 +56,11 @@ public class GetTrackTemplateListVO
     /// </summary>
     public string SubSystem { set; get; }
 
+    /// <summary>
+    /// 子系统id
+    /// </summary>
+    public int SubSystemId {  set; get; }
+
     /// <summary>
     /// 创建时间
     /// </summary>
diff --git a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
index d414e5c8..3bb1cfd9 100644
--- a/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
+++ b/src/SJZY.Track.Repository/Repositories/TrackTemplateRepository.cs
@@ -55,7 +55,8 @@ public class TrackTemplateRepository : BasicRepository<TrackTemplateEntity>, ITr
                 Code = a.Code,
                 CreateTime = a.CreateTime,
                 Name = a.Name,
-                SubSystem = b.CnName
+                SubSystem = b.CnName,
+                SubSystemId = b.Id
             })
             .ToPagedListAsync(input.PageIndex, input.PageSize);
         //.OrderByIF(input.TrackTemplateId > 0,