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

Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs

@@ -63,6 +63,7 @@ public class BusinessPlacesController : ControllerBase
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
+    [AllowAnonymous]
     [HttpPost("shifts")]
     public async Task<BusinessPlaceWithShiftResponse> GetShiftsByPlaceCustomCodeHttpPostAsync(BusinessPlaceGetShiftsRequest request)
     {

Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs

@@ -14,6 +14,16 @@ public class BusinessPlaceWithShiftResponse
     /// </summary>
     public string Name { get; set; }
 
+    /// <summary>
+    /// 基地/租户code
+    /// </summary>
+    public string TenantCode { get; set; }
+
+    /// <summary>
+    ///  基地/租户名称
+    /// </summary>
+    public string TenantName { get; set; }
+
     /// <summary>
     /// 餐次
     /// </summary>

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}";
 }

Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs

@@ -2,9 +2,13 @@
 using Dlhis.Basic.BusinessShift.Request;
 using Dlhis.Basic.BusinessShift.Response;
 using Dlhis.Entity.Basic.Entity;
+using Dlhis.User.Api;
 using Kurisu.AspNetCore.Utils.Extensions;
 using Kurisu.Core.CustomClass;
 using Kurisu.Core.DataAccess.Dto;
+using Kurisu.Core.Result;
+using Kurisu.Core.User.Abstractions;
+using Kurisu.SqlSugar.Attributes;
 using Kurisu.SqlSugar.Extensions;
 using Kurisu.SqlSugar.Services;
 using Mapster;
@@ -14,10 +18,12 @@ namespace Dlhis.Basic.BusinessShift.Services.Implements;
 public class BusinessPlaceShiftService : IBusinessPlaceShiftService
 {
     private readonly IDbContext _dbContext;
+    private readonly ITenantApi _tenantApi;
 
-    public BusinessPlaceShiftService(IDbContext dbContext)
+    public BusinessPlaceShiftService(IDbContext dbContext, ITenantApi tenantApi)
     {
         _dbContext = dbContext;
+        _tenantApi = tenantApi;
     }
 
     public async Task<Pagination<BusinessPlaceShiftResponse>> GetPageAsync(BusinessPlaceShiftPageRequest request)
@@ -68,7 +74,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();
@@ -85,10 +91,16 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
             .OrderBy(x => x.Sequence) //排序
             .ToListAsync();
 
+        var tenantResult = await _tenantApi.GetTenantByCodeAsync(place.TenantId);
+        (tenantResult.Code == ApiStateCode.Success).ThrowIfFalse(tenantResult.Msg);
+        var tenantInfo = tenantResult.Data;
+
         return new BusinessPlaceWithShiftResponse
         {
             CustomCode = placeCustomCode,
             Name = place.Name,
+            TenantCode = tenantInfo.Code,
+            TenantName = tenantInfo.Name,
             Shifts = shifts.Select(shift => new BusinessPlaceShiftTinyResponse
             {
                 CustomCode = shift.CustomCode,

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);

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;
 }

Src/Dlhis.User.Api/ITenantApi.cs

@@ -11,4 +11,7 @@ public interface ITenantApi
     [Auth]
     [Get("/api/tenants/list")]
     Task<DefaultApiResult<List<TenantResponse>>> GetTenantsAsync();
+
+    [Get("/api/tenants/single")]
+    Task<DefaultApiResult<TenantResponse>> GetTenantByCodeAsync(string code);
 }

Src/Dlhis.User/Identity/Controllers/TenantsController.cs

@@ -39,4 +39,16 @@ public class TenantsController : ControllerBase
     {
         return await _tenantService.GetListAsync();
     }
+
+    /// <summary>
+    /// 获取租户
+    /// </summary>
+    /// <returns></returns>
+    [AllowAnonymous]
+    [HttpGet("single")]
+    public async Task<TenantResponse> GetTenantByCode(string code)
+    {
+        return await _tenantService.GetTenantByCode(code);
+    }
+    
 }

Src/Dlhis.User/Identity/Services/ITenantService.cs

@@ -9,4 +9,6 @@ public interface ITenantService : IScopeDependency
     Task<Pagination<TenantResponse>> GetPageAsync(TenantPageRequest request);
 
     Task<List<TenantResponse>> GetListAsync();
+
+    Task<TenantResponse> GetTenantByCode(string code);
 }

Src/Dlhis.User/Identity/Services/Implements/TenantService.cs

@@ -31,4 +31,12 @@ public class TenantService : ITenantService
                .Select<TenantResponse>()
                .ToListAsync();
     }
+
+    public async Task<TenantResponse> GetTenantByCode(string code)
+    {
+        return await _dbContext.Queryable<TenantEntity>()
+            .Where(x => x.Code == code)
+            .Select<TenantResponse>()
+            .FirstAsync();
+    }
 }