diff --git a/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 62a1bdb2..e2fb21f2 100644
--- a/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/src/SJZY.Track.Application/Dtos/ProvideServices/GetPageTrackOrderInput.cs
@@ -8,7 +8,25 @@ namespace SJZY.Track.Application.Dtos.ProvideServices
{
public class GetPageTrackOrderInput : PageInfoInput
{
+ ///
+ /// 子系统id
+ ///
+ public int SubSystemId { get; set; }
+ ///
+ /// 单号
+ ///
+ public List OrderNos { get; set; }
+
+ ///
+ /// 创建时间开始
+ ///
+ public DateTime? CreateTimeStart { get; set; }
+
+ ///
+ /// 创建时间截止
+ ///
+ public DateTime? createTimeEnd { get; set; }
}
///
@@ -16,6 +34,17 @@ namespace SJZY.Track.Application.Dtos.ProvideServices
///
public class TrackOrderDto
{
+ ///
+ /// 轨迹订单id
+ ///
+ public int Id { get; set; }
+ ///
+ /// 订单类型
+ ///
+ public string OrderType { get; set; }
+
+
+ public string OrderNumber { get; set; }
}
}
diff --git a/src/SJZY.Track.Application/Dtos/TrackContents/GetPageTrackContentInput.cs b/src/SJZY.Track.Application/Dtos/TrackContents/GetPageTrackContentInput.cs
index a494d030..7a009ccb 100644
--- a/src/SJZY.Track.Application/Dtos/TrackContents/GetPageTrackContentInput.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackContents/GetPageTrackContentInput.cs
@@ -15,8 +15,8 @@ namespace SJZY.Track.Application.Dtos.TrackContents
///
/// 关键字
- ///
- public string Keywords { get; set; }
+ ///
+ public string Keywords { get; set; } = "";
}
public class GetTrackContentListDto
diff --git a/src/SJZY.Track.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs b/src/SJZY.Track.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs
index ec218c97..ecdb123d 100644
--- a/src/SJZY.Track.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackStatus/GetTrackStatusListDto.cs
@@ -65,11 +65,11 @@ namespace SJZY.Track.Application.Dtos.TrackStatus
///
/// 子系统id
///
- public int SubSystemId { get; set; }
+ public int SubSystemId { get; set; }
///
/// 关键字
///
- public string Keywords { get; set; }
+ public string Keywords { get; set; } = "";
}
}
diff --git a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
index 357784df..3be009ac 100644
--- a/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
+++ b/src/SJZY.Track.Application/Dtos/TrackTemplates/GetPageTrackTemplateInput.cs
@@ -13,8 +13,8 @@
///
/// 关键字
///
- public string Keywords { get; set; }
-
+ public string Keywords { get; set; } = "";
+
///
/// 轨迹模版id,轨迹映射的查询使用
///
diff --git a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
index 7381144c..55560ce6 100644
--- a/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
+++ b/src/SJZY.Track.Application/Services/ProvideServices/OrderService.cs
@@ -79,13 +79,15 @@ public class OrderService : ApplicationService
#region 轨迹订单列表
///
- ///
+ /// 获取分页的轨迹订单
///
///
///
[HttpPost("/Order/GetTrackOrderList")]
public async Task> GetPageTrackOrder(GetPageTrackOrderInput input)
{
+
+
return null;
}
#endregion
diff --git a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
index e076b731..ded90121 100644
--- a/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
+++ b/src/SJZY.Track.Domain/Aggregates/OrderAggregate/IOrderRepository.cs
@@ -10,6 +10,7 @@ public interface IOrderRepository : IBasicRepository
///
///
Task CreateOrderAsync(OrderEntity order);
+ Task> GetOrderDetails(GetOrderDetailsInputVO input);
///
/// 根据订单号,获取订单模板
@@ -19,6 +20,13 @@ public interface IOrderRepository : IBasicRepository
///
Task> GetOrderTemplatesAsync(int orderType, List distinctOrderNumbers);
+ ///
+ /// 获取分页的轨迹订单
+ ///
+ ///
+ ///
+ Task> GetPageTrackOrder(GetPageTrackOrderInputVO input);
+
///
/// 关联订单
///
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs
new file mode 100644
index 00000000..082b245a
--- /dev/null
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetOrderDetailsInputVO.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Domain.Dtos.Order
+{
+ public class GetOrderDetailsInputVO
+ {
+
+ }
+
+ public class TrackOrderDetailVO
+ {
+
+ }
+}
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
new file mode 100644
index 00000000..882f2db8
--- /dev/null
+++ b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Domain.Dtos.Order
+{
+ public class GetPageTrackOrderInputVO
+ {
+
+ }
+
+ ///
+ /// 轨迹订单VO
+ ///
+ public class TrackOrderVO
+ {
+
+ }
+}
diff --git a/src/SJZY.Track.Repository/OrderRepository.cs b/src/SJZY.Track.Repository/OrderRepository.cs
index 645fb94b..303a6c5b 100644
--- a/src/SJZY.Track.Repository/OrderRepository.cs
+++ b/src/SJZY.Track.Repository/OrderRepository.cs
@@ -1,4 +1,5 @@
-using SJZY.Track.Domain;
+using Microsoft.AspNetCore.Mvc;
+using SJZY.Track.Domain;
using SJZY.Track.Domain.Aggregates.OrderAggregate;
using SJZY.Track.Domain.Dtos.Order;
@@ -57,4 +58,30 @@ public class OrderRepository : BasicRepository, IOrderRepository, I
tran.Complete();
}
+
+ #region 轨迹订单明细
+
+ ///
+ /// 根据轨迹订单id获取轨迹明细列表
+ ///
+ ///
+ ///
+ public async Task> GetOrderDetails(GetOrderDetailsInputVO input)
+ {
+ return null;
+ }
+ #endregion
+
+ #region 轨迹订单分页
+ ///
+ /// 获取分页的轨迹订单
+ ///
+ ///
+ ///
+ public async Task> GetPageTrackOrder(GetPageTrackOrderInputVO input)
+ {
+
+ return null;
+ }
+ #endregion
}
\ No newline at end of file