From f88f67934ee29658ac5191a185c25b159ea44653 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 10 Apr 2024 14:38:34 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/BalanceRecordPageDetailRequest.cs | 6 +++ .../Order/Request/BalanceRecordPageRequest.cs | 9 ++--- .../Order/Response/BalanceRecordResponse.cs | 39 +++++++------------ .../Services/Implements/BalanceService.cs | 22 +++++------ .../Order/Services/Implements/OrderService.cs | 33 +++++++--------- .../Setting/Controllers/SettingController.cs | 1 - .../Implements/CanteenSettingService.cs | 5 +-- 7 files changed, 48 insertions(+), 67 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs index 70790c08..8d5755c1 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageDetailRequest.cs @@ -11,6 +11,12 @@ public class BalanceRecordPageDetailRequest : PageDto, IValidatableObject /// public DateTimePeriod SearchDateTimePeriod { get; set; } + /// + /// 营业点codes + /// + public List BusinessplaceCodes { get; set; } + + public IEnumerable Validate(ValidationContext validationContext) { if (SearchDateTimePeriod != null) diff --git a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs index f60dcb0c..4ee465ae 100644 --- a/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BalanceRecordPageRequest.cs @@ -7,11 +7,6 @@ namespace Dlhis.Canteen.Dishes.Request; public class BalanceRecordPageRequest : PageDto, IValidatableObject { - /// - /// 营业点codes - /// - public List BusinessplaceCodes { get; set; } - /// /// 餐次 /// @@ -23,6 +18,10 @@ public class BalanceRecordPageRequest : PageDto, IValidatableObject [EnumDataType(typeof(BalanceRecordTypeEnumType))] public BalanceRecordTypeEnumType? Type { get; set; } + /// + /// 厂区 + /// + public string Factory { get; set; } /// /// 查询日期范围类型 DateTimeSearchEnumType diff --git a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs index 06604e64..81b0f35e 100644 --- a/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/BalanceRecordResponse.cs @@ -43,6 +43,11 @@ public class BalanceRecordResponse /// public DateTime CostDate { get; set; } + /// + /// 备注 + /// + public string Remark { get; set; } + /// /// 来源 /// @@ -63,30 +68,22 @@ public class BalanceRecordResponse /// /// 营业点 /// - public Guid? BusinessPlaceCode { get; set; } public string BusinessPlaceName { get; set; } /// /// 餐次 /// - public Guid? BusinessShiftCode { get; set; } - public string BusinessShiftName { get; set; } - + public ShiftEnumType? ShiftType { get; set; } + /// + /// 餐次 + /// + public string ShiftTypeDesc => ShiftType?.GetDescription(); + /// /// 消费机器唯一信息 /// public string DeviceInfo { get; set; } - /// - /// 餐补月份 - /// - public string SubsidiesFromMonth { get; set; } - - /// - /// Ip - /// - public string IP { get; set; } - /// /// 成本中心 /// @@ -97,11 +94,6 @@ public class BalanceRecordResponse /// public string OriginTenantId { get; set; } - /// - /// 成本计算是否允许跨基地范围 - /// - public bool IsCostCrossTenant { get; set; } - /// /// 数据状态 /// @@ -118,12 +110,7 @@ public class BalanceRecordResponse public DateTime CostDateTime { get; set; } /// - /// 厂区id + /// 厂区 /// - public string TenantId { get; set; } - - /// - /// 厂区名称 - /// - public string TenantName { get; set; } + public string Factory { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs index 7f14ac0a..86d3dddc 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/BalanceService.cs @@ -43,43 +43,37 @@ public class BalanceService : IBalanceService .LeftJoin((record, ga) => record.UserNo == ga.No) .LeftJoin((record, ga, department) => ga.DepartmentNo == department.No) .LeftJoin((record, ga, department, bplace) => record.BusinessPlaceCode == bplace.Code) - .LeftJoin((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 { diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index 47addce2..065fd80f 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -287,10 +287,13 @@ public class OrderService : BaseOrderService, IOrderService /// private async Task ConsumeAsync(ConsumeRequest request, GainfoEntity gainfo) { - var device = await DbContext.Queryable().Where(x => x.UniqueNo == request.DeviceUniqueNo).Where(x => x.Enable).FirstAsync(); - device.ThrowIfNull("设备不存在或者尚未启用"); - var registry = await DbContext.Queryable().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo).FirstAsync(); - registry.ThrowIfNull("设备尚未注册"); + var registry = await DbContext.Queryable().Where(x => x.DeviceUniqueNo == request.DeviceUniqueNo).SingleAsync(); + registry.ThrowIfNull("设备尚未登记"); + + var device = await DbContext.Queryable().Where(x => x.UniqueNo == request.DeviceUniqueNo).SingleAsync(); + device.ThrowIfNull("设备尚未登记"); + device.Enable.ThrowIfFalse("设备已被停用"); + var businessPlaceInfo = await DbContext.Queryable() .LeftJoin((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().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(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 /// private async Task Verify(List shifts, DateTime costDateTime, CanteenOrderEntity order) { - //在线 - if (!order.IsOffline) + shifts.FirstOrDefault(x => new TimePeriod() { - 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); diff --git a/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs b/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs index b9b89d8c..44a90461 100644 --- a/Src/Dlhis.Canteen/Setting/Controllers/SettingController.cs +++ b/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; diff --git a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs index 206eeb40..52685889 100644 --- a/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs +++ b/Src/Dlhis.Canteen/Setting/Services/Implements/CanteenSettingService.cs @@ -87,9 +87,8 @@ public class CanteenSettingService : ICanteenSettingService var settings = await _context.Queryable() .Where(x => x.Enable) .Where(x => x.TenantId == tenantId) - .Where(x => - (x.UniqueType == CanteenSettingUnqiueEnumType.Person && x.UniqueValue == userNo) - || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant) + .Where(x => (x.UniqueType == CanteenSettingUnqiueEnumType.Person && x.UniqueValue == userNo) + || x.UniqueType == CanteenSettingUnqiueEnumType.Tenant) .ToListAsync(); //从基地 -> 个人,确保下面循环做到覆盖,并且以个人配置为主