From cc5600c6f76d5e96e6cfaac813285c10f814aa7b Mon Sep 17 00:00:00 2001
From: "AERWEN\\26795" <123456789a>
Date: Sun, 22 Oct 2023 10:33:51 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dto/Api/OrderManage/Orders/OrderCoupon.cs |  7 ++--
 .../Vo/Api/OrderManage/Orders/OrderApiVo.cs   | 11 ++++++
 .../OrderManage/Orders/OrderServiceApi.cs     | 34 +++++++++++++++----
 3 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/ARW.Model/Dto/Api/OrderManage/Orders/OrderCoupon.cs b/ARW.Model/Dto/Api/OrderManage/Orders/OrderCoupon.cs
index 41880b8..cad0b43 100644
--- a/ARW.Model/Dto/Api/OrderManage/Orders/OrderCoupon.cs
+++ b/ARW.Model/Dto/Api/OrderManage/Orders/OrderCoupon.cs
@@ -12,10 +12,11 @@ namespace ARW.Model.Dto.Api.OrderManage.Orders
     /// @author lwh
     /// @date 2023-09-01
     /// </summary>
-    public class OrderQueryDtoApi : PagerInfo 
+    public class OrderQueryDtoApi : PagerInfo
     {
         public long CustomerGuid { get; set; }
         public string OrderNumber { get; set; }
+        public int Status { get; set; }
         public int? PayType { get; set; }
         public int? PayStatus { get; set; }
         public int? DeliveryType { get; set; }
@@ -24,8 +25,8 @@ namespace ARW.Model.Dto.Api.OrderManage.Orders
         public int? ReceiptStatus { get; set; }
         public int OrderStatus { get; set; }
     }
-	
-	
+
+
     /// <summary>
     /// 订单详情输入对象Api
     ///
diff --git a/ARW.Model/Vo/Api/OrderManage/Orders/OrderApiVo.cs b/ARW.Model/Vo/Api/OrderManage/Orders/OrderApiVo.cs
index 0bfc0ec..1c0f440 100644
--- a/ARW.Model/Vo/Api/OrderManage/Orders/OrderApiVo.cs
+++ b/ARW.Model/Vo/Api/OrderManage/Orders/OrderApiVo.cs
@@ -94,6 +94,17 @@ namespace ARW.Model.Vo.Api.OrderManage.Orders
         /// </summary>
         public int IsComment { get; set; }
 
+
+
+        /// <summary>
+        /// 订单状态 (1待付款 2待发货 3待收货 4已完成)
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 订单状态名称 (1待付款 2待发货 3待收货 4已完成)
+        /// </summary>
+        public string StatusName { get; set; }
     }
 	
 	
diff --git a/ARW.Service/Api/BusinessService/OrderManage/Orders/OrderServiceApi.cs b/ARW.Service/Api/BusinessService/OrderManage/Orders/OrderServiceApi.cs
index 54836b4..c3ffaa5 100644
--- a/ARW.Service/Api/BusinessService/OrderManage/Orders/OrderServiceApi.cs
+++ b/ARW.Service/Api/BusinessService/OrderManage/Orders/OrderServiceApi.cs
@@ -81,14 +81,12 @@ namespace ARW.Service.Api.BusinessService.OrderManage.Orders
             //开始拼装查询条件d
             var predicate = Expressionable.Create<Order>();
 
+            predicate = predicate.AndIF(parm.Status == 1, s => s.PayStatus == 1 && s.OrderStatus == 1);
+            predicate = predicate.AndIF(parm.Status == 2, s => s.DeliveryStatus == 1 && s.PayStatus == 2 && s.OrderStatus == 1);
+            predicate = predicate.AndIF(parm.Status == 3, s => s.ReceiptStatus == 1 && s.DeliveryStatus == 2 && s.PayStatus == 2 && s.OrderStatus == 1);
+            predicate = predicate.AndIF(parm.Status == 4, s => s.PayStatus == 2 && s.OrderStatus == 4);
             predicate = predicate.AndIF(parm.CustomerGuid != 0, s => s.CustomerGuid == parm.CustomerGuid);
             predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.OrderNumber), s => s.OrderNumber.Contains(parm.OrderNumber));
-            predicate = predicate.AndIF(parm.OrderStatus != 0, s => s.OrderStatus == parm.OrderStatus);
-            predicate = predicate.AndIF(parm.PayType != null, s => s.PayType == parm.PayType);
-            predicate = predicate.AndIF(parm.PayStatus != null, s => s.PayStatus == parm.PayStatus);
-            predicate = predicate.AndIF(parm.DeliveryType != null, s => s.DeliveryType == parm.DeliveryType);
-            predicate = predicate.AndIF(parm.DeliveryStatus != null, s => s.DeliveryStatus == parm.DeliveryStatus);
-            predicate = predicate.AndIF(parm.ReceiptStatus != null, s => s.ReceiptStatus == parm.ReceiptStatus);
             var query = _OrderRepository
                 .Queryable()
                 .Where(predicate.ToExpression())
@@ -134,6 +132,30 @@ namespace ARW.Service.Api.BusinessService.OrderManage.Orders
                     goodsList.Add(orderGood);
                 }
                 item.GoodsList = goodsList;
+
+
+                /* 处理订单状态 */
+                if(item.PayStatus == 1 && item.OrderStatus == 1)
+                {
+                    item.Status = 1;
+                    item.StatusName = "待付款";
+                }
+                if(item.DeliveryStatus == 1 && item.PayStatus == 2 && item.OrderStatus == 1)
+                {
+                    item.Status = 2;
+                    item.StatusName = "待发货";
+                }
+                if (item.DeliveryStatus == 2 && item.ReceiptStatus == 1 && item.PayStatus == 2 && item.OrderStatus == 1)
+                {
+                    item.Status = 3;
+                    item.StatusName = "待收货";
+                }
+                if (item.PayStatus == 2 && item.OrderStatus == 4)
+                {
+                    item.Status = 4;
+                    item.StatusName = "已完成";
+                }
+
             }
 
             return list;