From 8f856726255e5bc8b5c12a20cf95d1771564ea79 Mon Sep 17 00:00:00 2001
From: moyongzhen <2534173414@qq.com>
Date: Tue, 12 Mar 2024 09:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=20=20=20=E8=AE=A2=E5=8D=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B,=E5=AE=A2=E6=88=B7=20=E7=9A=84=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProvideServices/GetPageTrackOrderInput.cs   | 15 +++++++++++++++
 .../Options/GetCamsUrlOptions.cs                | 17 +++++++++++++++++
 .../Dtos/Order/GetPageTrackOrderInputVO.cs      | 15 +++++++++++++++
 .../Repositories/OrderRepository.cs             |  3 +++
 4 files changed, 50 insertions(+)
 create mode 100644 src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs

diff --git a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs b/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
index 81aa553e..26e2e776 100644
--- a/src/SJZY.Track.Application.Contract/Dtos/ProvideServices/GetPageTrackOrderInput.cs
+++ b/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>
diff --git a/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs b/src/SJZY.Track.Application/Options/GetCamsUrlOptions.cs
new file mode 100644
index 00000000..82677724
--- /dev/null
+++ b/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; }
+    }
+}
diff --git a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs b/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
index c1b97cc5..67d955f9 100644
--- a/src/SJZY.Track.Domain/Dtos/Order/GetPageTrackOrderInputVO.cs
+++ b/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>
diff --git a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs b/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
index be9cc648..2516bb94 100644
--- a/src/SJZY.Track.Repository/Repositories/OrderRepository.cs
+++ b/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, ","),