From 5915264df9f4ba8a04d4a14a0af394003cf57a78 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Jan 2024 16:53:47 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=AE=BE=E5=A4=87=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BF=BD=E7=95=A5tenant?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs | 5 +++++
 .../Services/Implements/BusinessPlaceShiftService.cs         | 3 ++-
 .../Device/Services/Implements/DeviceConnectService.cs       | 2 ++
 Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs           | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs
index 5e39079a..cf2576ab 100644
--- a/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Response/BusinessPlaceShiftTinyResponse.cs
@@ -21,4 +21,9 @@ public class BusinessPlaceShiftTinyResponse
     /// 经营结束时间
     /// </summary>
     public TimeOnly End { get; set; }
+
+    /// <summary>
+    /// 时间段描述
+    /// </summary>
+    public string TimePeriodDesc => $"{Start}--{End}";
 }
diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
index a2f417bb..4ed9e149 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
@@ -5,6 +5,7 @@ using Dlhis.Entity.Basic.Entity;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.CustomClass;
 using Kurisu.Core.DataAccess.Dto;
+using Kurisu.SqlSugar.Attributes;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
@@ -68,7 +69,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
         }
     }
 
-
+    [IgnoreTenant]
     public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeAsync(string placeCustomCode)
     {
         var place = await _dbContext.Queryable<CanteenBusinessPlaceEntity>().Where(x => x.CustomCode == placeCustomCode).FirstAsync();
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
index 6a531783..e3e43cbc 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceConnectService.cs
@@ -5,6 +5,7 @@ using Dlhis.Entity.Device.Entities;
 using Dlhis.Entity.Device.Enums;
 using Kurisu.AspNetCore.UnifyResultAndValidation;
 using Kurisu.AspNetCore.Utils.Extensions;
+using Kurisu.SqlSugar.Attributes;
 using Kurisu.SqlSugar.Services;
 using Mapster;
 
@@ -19,6 +20,7 @@ public class DeviceConnectService : IDeviceConnectService
         _dbContext = dbContext;
     }
 
+    [IgnoreTenant]
     public async Task<string> ResigterAsync(DeviceResigterRequest request)
     {
         var device = await GetEnableDeviceAsync(request.UniqueNo);
diff --git a/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs
index 95255b0e..72c26956 100644
--- a/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs
+++ b/Src/Dlhis.Canteen/Order/Request/OrderAddRequest.cs
@@ -44,7 +44,7 @@ public class OrderAddRequest
     public decimal Amount { get; set; }
 
     /// <summary>
-    /// 消费时间,由机器提供
+    /// 消费时间,由机器提供,否则获取当前时间
     /// </summary>
-    public DateTime CostDateTime { get; set; }
+    public DateTime CostDateTime { get; set; } = DateTime.Now;
 }