From c582fb40c0c72189aff3f8f3c02658f91614fffd Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 21 Mar 2024 15:40:22 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Places/Controllers/BusinessPlacesController.cs  |  2 +-
 .../Order/Response/OrderAggregationResponse.cs      |  5 +++++
 .../Order/Response/OrderBookingResponse.cs          |  5 +++++
 .../Order/Services/Implements/OrderService.cs       |  3 ++-
 Src/Dlhis.Canteen/Program.cs                        | 13 +------------
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs
index 46a23303..dc4acda4 100644
--- a/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs
+++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs
@@ -56,7 +56,7 @@ public class BusinessPlacesController : ControllerBase
     [IgnoreTenant]
     public async Task<List<BusinessPlaceListResponse>> GetAllList(string tenant)
     {
-        return await _businessPlaceService.GetOpenedListAsync();
+        return await _businessPlaceService.GetOpenedListAsync(null, tenant);
     }
 
     /// <summary>
diff --git a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
index a1cb257b..1fb6cc24 100644
--- a/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderAggregationResponse.cs
@@ -48,4 +48,9 @@ public class OrderAggregationResponse
             return 0;
         }
     }
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
 }
diff --git a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
index 419d1fc9..b167b69f 100644
--- a/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
+++ b/Src/Dlhis.Canteen/Order/Response/OrderBookingResponse.cs
@@ -31,4 +31,9 @@ public class OrderBookingResponse
     /// 
     /// </summary>
     public string UserNo { get; set; }
+
+    /// <summary>
+    /// 订单时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
 }
diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 821b6610..b3f38f6f 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -301,6 +301,7 @@ public class OrderService : BaseOrderService, IOrderService
                 {
                     No = x.No,
                     BusinessPlaceName = bplace.Name,
+                    CreateTime = x.CreateTime
                 })
                 .ToPageListAsync(page);
 
@@ -317,7 +318,7 @@ public class OrderService : BaseOrderService, IOrderService
                     Name = d.Name,
                     ImageUrl = d.ImageUrl,
                     Number = x.Number,
-                    Price = x.Price
+                    Price = x.Price,
                 })
                 .ToListAsync();
 
diff --git a/Src/Dlhis.Canteen/Program.cs b/Src/Dlhis.Canteen/Program.cs
index b9710d07..198c78c7 100644
--- a/Src/Dlhis.Canteen/Program.cs
+++ b/Src/Dlhis.Canteen/Program.cs
@@ -22,18 +22,7 @@ public class Startup : DefaultStartup
 
     public override void ConfigureServices(IServiceCollection services)
     {
-        base.ConfigureServices(services);
-        //protected static string Obfuscate(string value)
-        //{
-        //    var last4Chars = "****";
-        //    if (value.IsPresent() && value.Length > 4)
-        //    {
-        //        last4Chars = value.Substring(value.Length - 4);
-        //    }
-
-        //    return "****" + last4Chars;
-        //}
-
+        base.ConfigureServices(services); 
         services.AddRedis();
     }