From 573911f90751925c29a8b6c29d2a3fbab8c4b19b Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 21 Mar 2024 19:13:33 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=A2=E5=8D=95=E8=81=9A=E5=90=88?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Response/OrderAggregationResponse.cs        | 11 ++++++++++-
 .../Order/Services/Implements/OrderService.cs         |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
index 05adb68d..c00cfec1 100644
--- a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
@@ -1,4 +1,5 @@
-using Kurisu.AspNetCore.Utils.Extensions;
+using Dlhis.Entity.Canteen.Enums;
+using Kurisu.AspNetCore.Utils.Extensions;
 
 namespace Dlhis.Canteen.Order.Response;
 
@@ -55,4 +56,12 @@ public class OrderAggregationResponse
     public DateTime CreateTime { get; set; }
 
     public string Remark { get; set; }
+
+    /// <summary>
+    /// 订单状态
+    /// </summary>
+    public CanteenOrderStatusEnumType OrderStatus { get; set; }
+
+
+    public string OrderStatusDesc => OrderStatus.GetDescription();
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 36db7386..07bc6916 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -303,6 +303,7 @@ public class OrderService : BaseOrderService, IOrderService
                     BusinessPlaceName = bplace.Name,
                     CreateTime = x.CreateTime,
                     Remark = x.Remark,
+                    OrderStatus = x.OrderStatus,
                 })
                 .ToPageListAsync(page);