diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
index c82bf122..50572e48 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
+++ b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetOrderDetailsInput.cs
@@ -11,29 +11,34 @@
public class TrackOrderDetailDto
{
///
- /// 轨迹订单id
+ /// Id es主键
///
public int Id { get; set; }
+ ///
+ /// 轨迹订单id
+ ///
+ public int OrderId { set; get; }
+
///
/// 轨迹代码
///
- public string Code { get; set; }
+ public string? Code { get; set; }
///
/// 轨迹内容
///
- public string Content { get; set; }
+ public string? Content { get; set; }
///
/// 轨迹内容英文
///
- public string EnContent { get; set; }
+ public string? EnContent { get; set; }
///
/// 轨迹发生地
///
- public string TrackPlace { get; set; }
+ public string? TrackPlace { get; set; }
///
/// 轨迹发生时间
@@ -43,6 +48,6 @@
///
/// 轨迹发生时区
///
- public string TrackTimeZone { get; set; }
+ public string? TrackTimeZone { get; set; }
}
}
\ No newline at end of file
diff --git a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
index 27f73eda..dc814b49 100644
--- a/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
+++ b/src/SJZY.Track.Application/AutoMapper/OrderAutoMapperProfile.cs
@@ -21,7 +21,8 @@ public class OrderAutoMapperProfile : Profile
CreateMap(MemberList.None);
CreateMap(MemberList.None);
CreateMap, UnifyPageResultDto>(MemberList.None);
- CreateMap(MemberList.None).ForMember(dest => dest.Id, opt => opt.MapFrom(m => m.OrderId))
+ CreateMap(MemberList.None)
+ .ForMember(dest => dest.Id, opt => opt.Ignore())
.ForMember(dest => dest.Code, opt => opt.MapFrom(m => m.TrackCode))
.ForMember(dest => dest.Content, opt => opt.MapFrom(m => m.TrackContent))
.ForMember(dest => dest.EnContent, opt => opt.MapFrom(m => m.TrackEnContent))
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
index edf429d7..ffb67836 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
@@ -86,6 +86,11 @@ public class OrderService : ApplicationService
if (!trackDetails.IsNullOrEmpty())
{
var list = ObjectMapper.Map, List>(trackDetails);
+ int id = 1;
+ list.ForEach(a =>
+ {
+ a.Id = id++;
+ });
return list;
}
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
index 1abafb1b..8b6fd2cc 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/TrackQueryService.cs
@@ -68,47 +68,6 @@ public class TrackQueryService : ApplicationService
return res;
}
- #region 轨迹订单明细列表
-
- ///
- /// 根据轨迹订单id获取轨迹订单明细列表
- ///
- ///
- ///
- [HttpPost("/Track/GetDetails")]
- public async Task> GetOrderDetails(GetOrderDetailsInput input)
- {
- var trackDetails = await _trackDetailsRepository.GetListAsync(input.OrderId);
- if (!trackDetails.IsNullOrEmpty())
- {
- var list = ObjectMapper.Map, List>(trackDetails);
- return list;
- }
-
- return new List();
- }
-
- #endregion
-
- #region 轨迹订单分页
-
- ///
- /// 获取分页的轨迹订单
- ///
- ///
- ///
- [HttpPost("/Track/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 TrackDetailSort(List list, GetTrackInput input)
{
switch (input.SortMethod)
diff --git a/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
new file mode 100644
index 00000000..b0c86ec2
--- /dev/null
+++ b/src/SJZY.Track.Application/Services/TrackOrders/TrackOrderService.cs
@@ -0,0 +1,74 @@
+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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+
+namespace SJZY.Track.Application.Services.TrackOrders
+{
+ [ApiExplorerSettings(GroupName = "轨迹订单")]
+ [Route("/Track/Order")]
+ public class TrackOrderService : ApplicationService, ITransientDependency
+ {
+ private readonly IOrderRepository _orderRepository;
+ private readonly ITrackDetailsRepository _trackDetailsRepository;
+
+ public TrackOrderService(
+ IOrderRepository orderRepository,
+ ITrackDetailsRepository trackDetailsRepository
+ )
+ {
+ this._orderRepository=orderRepository;
+ this._trackDetailsRepository=trackDetailsRepository;
+
+ }
+
+ #region 轨迹订单明细
+
+ ///
+ /// 根据轨迹订单id获取轨迹订单明细列表
+ ///
+ ///
+ ///
+ [HttpPost("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("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
+ }
+}