From 5e9d4ac2a6e42014b97dd5b99167e82d3a4b22d7 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Jan 2024 16:39:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E6=B6=88=E8=B4=B9?=
 =?UTF-8?q?=E5=A4=84=E7=90=86,=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAsql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Services/Implements/OrderService.cs    | 16 +++++++++++-----
 Src/Dlhis.Canteen/appsettings.json               |  3 ++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
index 2e6b59a3..6679a3d2 100644
--- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
+++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs
@@ -10,6 +10,7 @@ using Kurisu.AspNetCore.Utils;
 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;
@@ -39,6 +40,7 @@ public class OrderService : IOrderService
         return page;
     }
 
+    [IgnoreTenant]
     public async Task AddAsync(OrderAddRequest request)
     {
         var device = await _dbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).Where(x => x.Enable).FirstAsync();
@@ -67,7 +69,7 @@ public class OrderService : IOrderService
             .FirstAsync();
 
         var settings = await _canteenSettingService.GetUserSettingAsync(gafinfo.No);
-        var switchTime = GetSetting<TimeOnly>(settings, CanteenSettingItemEnumType.BusinessSwitchTime);
+        var switchTime = GetSetting<TimeOnly?>(settings, CanteenSettingItemEnumType.BusinessSwitchTime);
         //金额处理
         request.Amount = request.Type == BalanceRecordTypeEnumType.In ? Math.Abs(request.Amount) : -Math.Abs(request.Amount);
 
@@ -89,9 +91,12 @@ public class OrderService : IOrderService
                 costDate = DateTime.Now.AddDays(-1);
 
             var beginOfDay = DateTime.Today;
-            var setTime = beginOfDay.Add(switchTime.ToTimeSpan());
-            if (DateTime.Now < setTime)
-                costDate = DateTime.Now.AddDays(-1);
+            if (switchTime.HasValue)
+            {
+                var setTime = beginOfDay.Add(switchTime.Value.ToTimeSpan());
+                if (DateTime.Now < setTime)
+                    costDate = DateTime.Now.AddDays(-1);
+            }
         }
 
         var order = new CanteenOrderEntity
@@ -117,9 +122,10 @@ public class OrderService : IOrderService
             IsOffline = request.IsOffline,
             IsCostCrossTenant = GetSetting<bool>(settings, CanteenSettingItemEnumType.AllowCrossTenant),
 
-            OriginTenantId = canteenUser.TenantId,
+            OriginTenantId = canteenUser.TenantId,//人员可能跨基地消费
 
             Status = BalanceRecordStatusEnumType.Doubtful,
+            TenantId = device.TenantId, //设备才能标识当前消费的基地
         };
 
         var id = await _dbContext.InsertReturnIdentityAsync(order);
diff --git a/Src/Dlhis.Canteen/appsettings.json b/Src/Dlhis.Canteen/appsettings.json
index 1469a953..c244b003 100644
--- a/Src/Dlhis.Canteen/appsettings.json
+++ b/Src/Dlhis.Canteen/appsettings.json
@@ -13,7 +13,8 @@
     "DefaultConnectionString": "server=192.168.199.124;port=3306;userid=root;password=dlhis123;database=yikatong;charset=utf8mb4;",
     "SlaveConnectionString": [],
     "Timeout": 30,
-    "SlowSqlTime": 1
+    "SlowSqlTime": 1,
+    "EnableSqlLog": true
   },
   "SwaggerOptions": {
     "Enable": true,