fix 查询优化

Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs

@@ -11,6 +11,12 @@ public class BalanceRecordPageDetailRequest : PageDto, IValidatableObject
     /// </summary>
     public DateTimePeriod SearchDateTimePeriod { get; set; }
 
+    /// <summary>
+    /// 营业点codes
+    /// </summary>
+    public List<Guid?> BusinessplaceCodes { get; set; }
+
+
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {
         if (SearchDateTimePeriod != null)

Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs

@@ -7,11 +7,6 @@ namespace Dlhis.Canteen.Dishes.Request;
 
 public class BalanceRecordPageRequest : PageDto, IValidatableObject
 {
-    /// <summary>
-    /// 营业点codes
-    /// </summary>
-    public List<Guid?> BusinessplaceCodes { get; set; }
-
     /// <summary>
     /// 餐次
     /// </summary>
@@ -23,6 +18,10 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject
     [EnumDataType(typeof(BalanceRecordTypeEnumType))]
     public BalanceRecordTypeEnumType? Type { get; set; }
 
+    /// <summary>
+    /// 厂区
+    /// </summary>
+    public string Factory { get; set; }
 
     /// <summary>
     /// 查询日期范围类型 DateTimeSearchEnumType

Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs

@@ -43,6 +43,11 @@ public class BalanceRecordResponse
     /// </summary>
     public DateTime CostDate { get; set; }
 
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Remark { get; set; }
+
     /// <summary>
     /// 来源
     /// </summary>
@@ -63,30 +68,22 @@ public class BalanceRecordResponse
     /// <summary>
     /// 营业点
     /// </summary>
-    public Guid? BusinessPlaceCode { get; set; }
     public string BusinessPlaceName { get; set; }
 
     /// <summary>
     /// 餐次
     /// </summary>
-    public Guid? BusinessShiftCode { get; set; }
+    public ShiftEnumType? ShiftType { get; set; }
-    public string BusinessShiftName { get; set; }
+    /// <summary>
+    /// 餐次
+    /// </summary>
+    public string ShiftTypeDesc => ShiftType?.GetDescription();
 
     /// <summary>
     /// 消费机器唯一信息
     /// </summary>
     public string DeviceInfo { get; set; }
 
-    /// <summary>
-    /// 餐补月份
-    /// </summary>
-    public string SubsidiesFromMonth { get; set; }
-
-    /// <summary>
-    /// Ip
-    /// </summary>
-    public string IP { get; set; }
-
     /// <summary>
     /// 成本中心
     /// </summary>
@@ -97,11 +94,6 @@ public class BalanceRecordResponse
     /// </summary>
     public string OriginTenantId { get; set; }
 
-    /// <summary>
-    /// 成本计算是否允许跨基地范围
-    /// </summary>
-    public bool IsCostCrossTenant { get; set; }
-
     /// <summary>
     /// 数据状态
     /// </summary>
@@ -118,12 +110,7 @@ public class BalanceRecordResponse
     public DateTime CostDateTime { get; set; }
 
     /// <summary>
-    /// 厂区id
+    /// 厂区
     /// </summary>
-    public string TenantId { get; set; }
+    public string Factory { get; set; }
-
-    /// <summary>
-    /// 厂区名称
-    /// </summary>
-    public string TenantName { get; set; }
 }

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

@@ -43,43 +43,37 @@ public class BalanceService : IBalanceService
                 .LeftJoin<GainfoEntity>((record, ga) => record.UserNo == ga.No)
                 .LeftJoin<DepartmentEntity>((record, ga, department) => ga.DepartmentNo == department.No)
                 .LeftJoin<BusinessPlaceEntity>((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code)
-                .LeftJoin<BusinessShiftEntity>((record, ga, department, bplace, bshift) => record.BusinessShiftCode == bshift.Code)
                 .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDate >= request.SearchDateTimePeriod.Start)
                 .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDate <= request.SearchDateTimePeriod.End)
-                .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
                 .WhereIF(request.ShiftTypes.IsPresent(), record => request.ShiftTypes.Contains(record.ShiftType))
                 .WhereIF(request.Type.HasValue, record => record.Type == request.Type)
+                .WhereIF(request.Factory.IsPresent(), record => record.TenantId == request.Factory)
                 .WhereIF(request.Search.IsPresent(), (record, ga) =>
-                ga.Name.Contains(request.Search)
+                   ga.Name == request.Search
                 || ga.Code == request.Search
                 )
                 .OrderBy(record => record.CreateTime, OrderByType.Desc)
-                .Select((record, ga, department, bplace, bshift) => new BalanceRecordResponse
+                .Select((record, ga, department, bplace) => new BalanceRecordResponse
                 {
                     Id = record.Id,
+                    No = record.No,
                     Amount = SqlFunc.Abs(record.Amount),
-                    BusinessPlaceCode = record.BusinessPlaceCode,
-                    BusinessShiftCode = record.BusinessShiftCode,
                     CostDate = record.CostDate,
                     CostId = record.CostId,
                     DepartmentNo = record.DepartmentNo,
                     DeviceInfo = record.DeviceUniqueNo,
-                    IP = record.IP,
                     UserNo = record.UserNo,
                     UserCode = record.UserCode,
                     Type = record.Type,
-                    SubsidiesFromMonth = record.SubsidiesFromMonth,
                     Status = record.Status,
                     Source = record.Source,
-                    No = record.No,
-                    IsCostCrossTenant = record.IsCostCrossTenant,
                     OriginTenantId = record.OriginTenantId,
                     Name = record.Name,
                     DepartmentName = department.Name,
                     BusinessPlaceName = bplace.Name,
-                    BusinessShiftName = bshift.Name,
                     CostDateTime = record.CostDateTime,
-                    TenantId = record.TenantId,
+                    Factory = record.TenantId,
+                    Remark = record.Remark,
                 })
                 .ToPageListAsync(request);
 
@@ -90,7 +84,8 @@ public class BalanceService : IBalanceService
 
             page.Data.ForEach(item =>
             {
-                item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name;
+                item.OriginTenantId = tenants.FirstOrDefault(x => x.Code == item.OriginTenantId)?.Name;
+                item.Factory = tenants.FirstOrDefault(x => x.Code == item.Factory)?.Name;
             });
 
         }
@@ -258,6 +253,7 @@ public class BalanceService : IBalanceService
             .WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, record => record.CostDateTime >= request.SearchDateTimePeriod.Start)
             .WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, record => record.CostDateTime <= request.SearchDateTimePeriod.End)
             .WhereIF(request.Search.IsPresent(), record => record.UserCode == request.Search || record.Name == request.Search)
+            .WhereIF(request.BusinessplaceCodes.IsPresent(), record => request.BusinessplaceCodes.Contains(record.BusinessPlaceCode))
             .OrderBy(record => record.CostDateTime, OrderByType.Desc)
             .Select((record, department, bplace, gainfo) => new BalanceRecordDetailPageResponse
             {

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

@@ -287,10 +287,13 @@ public class OrderService : BaseOrderService, IOrderService
     /// <returns></returns>
     private async Task ConsumeAsync(ConsumeRequest request, GainfoEntity gainfo)
     {
-        var device = await DbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).Where(x => x.Enable).FirstAsync();
+        var registry = await DbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo).SingleAsync();
-        device.ThrowIfNull("设备不存在或者尚未启用");
+        registry.ThrowIfNull("设备尚未登记");
-        var registry = await DbContext.Queryable<DeviceRegistryEntity>().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo).FirstAsync();
+
-        registry.ThrowIfNull("设备尚未注册");
+        var device = await DbContext.Queryable<DeviceEntity>().Where(x => x.UniqueNo == request.DeviceUniqueNo).SingleAsync();
+        device.ThrowIfNull("设备尚未登记");
+        device.Enable.ThrowIfFalse("设备已被停用");
+
         var businessPlaceInfo = await DbContext.Queryable<BusinessPlaceEntity>()
             .LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, sr) => x.Code == sr.PlaceCode)
             .Where(x => x.Code == registry.BusinessPlaceCode)
@@ -301,10 +304,11 @@ public class OrderService : BaseOrderService, IOrderService
                 x.TenantId
             })
             .FirstAsync();
-        businessPlaceInfo.ThrowIfNull("营业点尚未设置");
+        businessPlaceInfo.ThrowIfNull("设备尚未登记营业点");
 
         //获取当前消费餐次
         var shifts = await DbContext.Queryable<BusinessShiftMealRelationshipEntity>().Where(x => x.ShiftCode == businessPlaceInfo.ShiftCode).ToListAsync();
+        shifts.ThrowIfEmpty("营业点餐次尚未设置");
 
         var shift = shifts.FirstOrDefault(x => new TimePeriod()
         {
@@ -312,15 +316,10 @@ public class OrderService : BaseOrderService, IOrderService
             End = x.End
 
         }.IsPresent1(request.CostDateTime));
+        shift.ThrowIfNull("非就餐时间,无法消费");
 
         var switchTime = await GetSettingAsync<TimeOnly?>(businessPlaceInfo.TenantId, CanteenSettingItemEnumType.BusinessSwitchTime);
 
-        var shiftTimePeriod = new TimePeriod()
-        {
-            Start = shift?.Start,
-            End = shift?.End
-        };
-
         //计算成本日期 todo 优化
         var costDate = DateTime.Now;
         if (shift == null)
@@ -531,16 +530,12 @@ public class OrderService : BaseOrderService, IOrderService
     /// <exception cref="UserFriendlyException"></exception>
     private async Task Verify(List<BusinessShiftMealRelationshipEntity> shifts, DateTime costDateTime, CanteenOrderEntity order)
     {
-        //在线
+        shifts.FirstOrDefault(x => new TimePeriod()
-        if (!order.IsOffline)
         {
-            shifts.FirstOrDefault(x => new TimePeriod()
+            Start = x.Start,
-            {
+            End = x.End,
-                Start = x.Start,
-                End = x.End,
 
-            }.IsPresent1(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
+        }.IsPresent1(costDateTime)).ThrowIfNull("当前非就餐时间,无法消费");
-        }
 
         var beginOfDay = DateTime.Today;
         var endOfDay = beginOfDay.AddDays(1).AddSeconds(-1);

Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs

@@ -1,7 +1,6 @@
 using Dlhis.Canteen.Setting.Request;
 using Dlhis.Canteen.Setting.Response;
 using Dlhis.Canteen.Setting.Services;
-using Dlhis.Entity.Canteen.Enums;
 using Kurisu.Core.DataAccess.Dto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs

@@ -87,9 +87,8 @@ public class CanteenSettingService : ICanteenSettingService
         var settings = await _context.Queryable<CanteenSettingEntity>()
                 .Where(x => x.Enable)
                 .Where(x => x.TenantId == tenantId)
-                .Where(x =>
+                .Where(x => (x.UniqueType == CanteenSettingUnqiueEnumType.Person && x.UniqueValue == userNo)
-                (x.UniqueType == CanteenSettingUnqiueEnumType.Person && x.UniqueValue == userNo)
+                            || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant)
-                || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant)
                 .ToListAsync();
 
         //从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主