Merge branch 'S01-轨迹中台' into dev

src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs

@@ -17,6 +17,16 @@ public class GetPageTrackOrderInput : PageInfoInput
     /// </summary>
     public string? OrderNos { get; set; }
 
+    /// <summary>
+    /// 订单类型
+    /// </summary>
+    public int? TrackOrderType { get; set; }
+
+    /// <summary>
+    /// 客户id
+    /// </summary>
+    public int? CustomerId { get; set; }
+
     /// <summary>
     /// 创建时间开始
     /// </summary>
@@ -73,6 +83,11 @@ public class TrackOrderDto
     /// </summary>
     public string? CustomerCode { get; set; }
 
+    /// <summary>
+    /// 客户id
+    /// </summary>
+    public int CustomerId { get; set; }
+
     /// <summary>
     /// 订单明细（json）
     /// </summary>

src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs

@@ -0,0 +1,17 @@
+using SJZY.Expand.ABP.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SJZY.Track.Application.Options
+{
+    public class GetCamsUrlOptions : IOptionAutoInjection
+    {
+        /// <summary>
+        /// 2.5URL
+        /// </summary>
+        public string? Cams25URL {  get; set; }
+    }
+}

src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs

@@ -24,6 +24,16 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// </summary>
         public string? OrderNos { get; set; }
 
+        /// <summary>
+        /// 订单类型
+        /// </summary>
+        public int? TrackOrderType { get; set; }
+
+        /// <summary>
+        /// 客户id
+        /// </summary>
+        public int? CustomerId { get; set; }
+
         /// <summary>
         /// 创建时间开始
         /// </summary>
@@ -75,6 +85,11 @@ namespace SJZY.Track.Domain.Dtos.Order
         /// </summary>
         public string? CustomerCode { get; set; }
 
+        /// <summary>
+        /// 客户id
+        /// </summary>
+        public int CustomerId { get; set; }
+
         ///// <summary>
         ///// 订单明细（json）
         ///// </summary>

src/SJZY.Track.Repository/Repositories/OrderRepository.cs

@@ -137,6 +137,8 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                 (a, b, c) => a.CreateTime >= input.CreateTimeStart)
             .WhereIF((!input.CreateTimeStart.HasValue) && input.CreateTimeEnd.HasValue,
                 (a, b, c) => a.CreateTime <= input.CreateTimeEnd)
+            .WhereIF(input.CustomerId>0, (a, b, c) => a.CustomId==input.CustomerId)
+            .WhereIF(input.TrackOrderType>0, (a, b, c) => a.OrderType==input.TrackOrderType)
             .OrderByDescending((a, b, c) => a.CreateTime)
             .Select((a, b, c) => new TrackOrderVO
             {
@@ -148,6 +150,7 @@ public class OrderRepository : BasicRepository<OrderEntity>, IOrderRepository, I
                     .Return("箱/袋单").ElseIF(a.OrderType == 4).Return("FBA订单").End(""),
                 CustomerShortName = b.Abbreviation,
                 CustomerCode = b.Code,
+                CustomerId = a.CustomId,
                 //TrackTemplateNames = SqlFunc.Subqueryable<OrderTemplateEntity>()
                 //    .LeftJoin<TrackTemplateEntity>((aa, bb) => aa.TrackTemplateId == bb.Id)
                 //    .Where((aa, bb) => a.Id == aa.OrderId).SelectStringJoin((aa, bb) => bb.Name, ","),