Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs

@@ -69,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);
 
@@ -91,10 +91,13 @@ public class OrderService : IOrderService
                 costDate = DateTime.Now.AddDays(-1);
 
             var beginOfDay = DateTime.Today;
-            var setTime = beginOfDay.Add(switchTime.ToTimeSpan());
+            if (switchTime.HasValue)
+            {
+                var setTime = beginOfDay.Add(switchTime.Value.ToTimeSpan());
                 if (DateTime.Now < setTime)
                     costDate = DateTime.Now.AddDays(-1);
             }
+        }
 
         var order = new CanteenOrderEntity
         {
@@ -119,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);