From 1c943224c13efb389f3000150cd69638aa0e16fc Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sun, 11 Jun 2023 15:29:11 +0800
Subject: [PATCH] 1

---
 BBWYB.Server.Business/Order/OrderBusiness.cs              | 4 ++--
 BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 144931d..9bbe68d 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -33,9 +33,9 @@ namespace BBWYB.Server.Business
                              .LeftJoin((o, ocs, oct) => o.Id == ocs.OrderId)
                              .LeftJoin((o, ocs, oct) => o.Id == oct.OrderId);
             if (!string.IsNullOrEmpty(request.OrderId))
-            {
                 select = select.Where((o, ocs, oct) => o.Id == request.OrderId);
-            }
+            else if (!string.IsNullOrEmpty(request.OrderSn))
+                select = select.Where((o, ocs, oct) => o.OrderSn == request.OrderSn);
             else
             {
                 if (!string.IsNullOrEmpty(request.Sku) || !string.IsNullOrEmpty(request.SourceSku) || !string.IsNullOrEmpty(request.ProductId))
diff --git a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
index 0b78c2c..8f73ec2 100644
--- a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
@@ -2,10 +2,16 @@
 {
     public class QueryOrderRequest
     {
-        /// 当订单号有值时会忽略其余所有条件
+        /// <summary>
+        /// 订单号,有值时会忽略其余所有条件,OrderId与OrderSn同时有值,优先OrderId
         /// </summary>
         public string OrderId { get; set; }
 
+        /// <summary>
+        /// 订单Sn号,有值时会忽略其余所有条件,OrderId与OrderSn同时有值,优先OrderId
+        /// </summary>
+        public string OrderSn { get; set; }
+
         /// <summary>
         /// 店铺Id
         /// </summary>