yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 菜单时效范围

Browse Source
This commit is contained in:
liguoyang
2024-03-21 20:23:20 +08:00
parent 573911f907
commit 89904fead1
5 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Src/Dlhis.Basic/Dishes/Request/DishesMenuNameDateSaveRequest.cs
View File

@@ -1,5 +1,6 @@
using System.ComponentModel.DataAnnotations;
using Kurisu.AspNetCore.Utils.Extensions;
using Kurisu.Core.CustomClass;
namespace Dlhis.Basic.Dishes.Request;
@@ -11,29 +12,26 @@ public class DishesMenuNameDateSaveRequest : IValidatableObject
public string CustomCode { get; set; }
/// <summary>
/// 菜单日期
/// 时间段
/// </summary>
public DateTime Date { get; set; }
[Required(ErrorMessage = "时间段不可为空")]
public DateTimePeriod Period { get; set; }
/// <summary>
/// 餐次数据
/// </summary>
public List<DishesMenuShiftTypeSaveRequest> ShiftTypes { get; set; }
public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
{
if (Date < DateTime.Today)
if (Period.Start < Period.End)
{
yield return new ValidationResult("菜单日期不能小于当天");
yield return new ValidationResult("时间范围有误", new[] { nameof(Period) });
}
//格式化
Date = Date.Date;
if (CustomCode.IsEmpty())
{
CustomCode = Date.ToString("yyyy-MM-dd");
CustomCode = Period.Start.Value.ToString("yyyy-MM-dd") + "." + Period.End.Value.ToString("yyyy-MM-dd");
}
}
}

9
Src/Dlhis.Basic/Dishes/Response/DishesMenuPageResponse.cs
View File

@@ -13,7 +13,12 @@ public class DishesMenuPageResponse
public Guid BusinessPlaceCode { get; set; }
/// <summary>
/// 营业日期
/// 营业日期 开始
/// </summary>
public DateTime Date { get; set; }
public DateTime StartDate { get; set; }
/// <summary>
/// 营业日期 结束
/// </summary>
public DateTime EndDate { get; set; }
}

50
Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs
View File

@@ -9,7 +9,8 @@ using Dlhis.Basic.Dishes.Request;
using Dlhis.Basic.Dishes.Response;
using Dlhis.Basic.BusinessPlace.Services;
using Dlhis.Basic.Dishes.Dto;
using Mapster;
using Kurisu.Core.CustomClass;
using System.Linq.Expressions;
namespace Dlhis.Basic.Dishes.Services.Implements;
@@ -28,12 +29,13 @@ public class DishesMenuService : IDishesMenuService
{
return await _dbContext.Queryable<DishesMenuEntity>()
.Where(x => x.BusinessPlaceCode == request.BusinessPlaceCode)
.GroupBy(x => new { x.BusinessPlaceCode, x.CustomCode, x.Date })
.GroupBy(x => new { x.BusinessPlaceCode, x.CustomCode, x.StartDate, x.EndDate })
.Select(x => new DishesMenuPageResponse
{
BusinessPlaceCode = x.BusinessPlaceCode,
CustomCode = x.CustomCode,
Date = x.Date,
StartDate = x.StartDate,
EndDate = x.EndDate,
})
.ToPageListAsync(request);
}
@@ -42,6 +44,8 @@ public class DishesMenuService : IDishesMenuService
{
var data = await _dbContext.Queryable<DishesMenuEntity>()
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.CustomCode == customCode)
.Where(x => x.StartDate >= date && x.EndDate <= date)
.ToListAsync();
return new DishesMenuSaveRequest
@@ -52,7 +56,11 @@ public class DishesMenuService : IDishesMenuService
new()
{
CustomCode = customCode,
Date = date,
Period = new DateTimePeriod
{
Start = data[0].StartDate,
End = data[0].EndDate,
},
ShiftTypes = data.GroupBy(x => x.ShiftType).Select(item =>
{
var shiftType = item.Key;
@@ -79,7 +87,7 @@ public class DishesMenuService : IDishesMenuService
var data = await _dbContext.Queryable<DishesMenuEntity>()
.LeftJoin<DishesEntity>((x, dishes) => x.DishesCode == dishes.CustomCode)
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => SqlFunc.DateIsSame(x.Date, date, DateType.Day))
.Where(x => x.StartDate >= date && x.EndDate <= date)
.Where((x, dishes) => dishes.Enable)
.WhereIF(shiftType.HasValue, x => x.ShiftType == shiftType)
.Where((x, dishes) => dishes.CategoryCode == categoryCode)
@@ -114,7 +122,7 @@ public class DishesMenuService : IDishesMenuService
var entities = request.Items.SelectMany(item =>
{
var customCode = item.CustomCode;
var date = item.Date;
var period = item.Period;
return item.ShiftTypes.SelectMany(shiftTypeItem =>
{
@@ -130,7 +138,8 @@ public class DishesMenuService : IDishesMenuService
{
BusinessPlaceCode = request.BusinessPlaceCode,
CustomCode = customCode,
Date = date,
StartDate = period.Start.Value,
EndDate = period.End.Value,
ShiftType = shiftType,
DishesCode = dishesCode,
Number = number,
@@ -143,31 +152,44 @@ public class DishesMenuService : IDishesMenuService
});
}).ToList();
var keys = entities.DistinctBy(x => new { x.Date, x.ShiftType }).Select(x => new { x.Date, x.ShiftType }).ToList();
var keys = entities.DistinctBy(x => new { x.StartDate, x.EndDate, x.ShiftType }).Select(x => new { x.StartDate, x.EndDate, x.ShiftType }).ToList();
var where = LinqExpressionExtension.False<DishesMenuEntity>();
keys.ForEach(x =>
{
where = where.Or(item => item.BusinessPlaceCode == request.BusinessPlaceCode
&& SqlFunc.DateIsSame(item.Date, x.Date, DateType.Day)
where = where.Or(item => item.BusinessPlaceCode == request.BusinessPlaceCode
&& SqlFunc.DateIsSame(item.StartDate, x.StartDate, DateType.Day)
&& SqlFunc.DateIsSame(item.EndDate, x.EndDate, DateType.Day)
&& item.ShiftType == x.ShiftType);
});
await _dbContext.Client.Deleteable<DishesMenuEntity>().Where(where).ExecuteCommandAsync();
await _dbContext.InsertAsync(entities);
if (request.Items.Any())
{
Expression<Func<DishesMenuEntity, bool>> whereCheck = LinqExpressionExtension.False<DishesMenuEntity>();
request.Items.ForEach(p =>
{
whereCheck = where.Or(x => !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End));
});
var duplicate = await _dbContext.Queryable<DishesMenuEntity>().Where(whereCheck).AnyAsync();
duplicate.ThrowIfTrue("菜单时效冲突");
}
}
public async Task<DishesMenuDetailDto> GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode)
{
var detail = await _dbContext.Queryable<DishesMenuEntity>()
.LeftJoin<DishesEntity>((x, d) => x.DishesCode == d.CustomCode)
.Where(x => SqlFunc.DateIsSame(x.Date, date, DateType.Day))
.Where(x => x.StartDate >= date && x.EndDate <= date)
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
.Where(x => x.ShiftType == shiftType)
.Where(x => x.DishesCode == dishesCode)
.Where((x, d) => d.Enable)
.Select((x, d) => new DishesMenuDetailDto
{
Date = x.Date,
Date = date,
MenuId = x.Id,
DishesId = d.Id,
DishesCode = d.CustomCode,
@@ -185,11 +207,11 @@ public class DishesMenuService : IDishesMenuService
private static void CheckDuplicateData(DishesMenuSaveRequest request)
{
(request.Items.DistinctBy(x => new { x.CustomCode, x.Date }).Count() != request.Items.Count).ThrowIfTrue("菜单不可重复");
(request.Items.DistinctBy(x => new { x.CustomCode, x.Period.Start, x.Period.End }).Count() != request.Items.Count).ThrowIfTrue("菜单不可重复");
foreach (var item in request.Items)
{
var u = item.Date.ToString("yyyy-MM-dd") + ". " + item.CustomCode;
var u = item.Period.Start.Value.ToString("yyyy-MM-dd") + "." + item.Period.End.Value.ToString("yyyy-MM-dd") + "." + item.CustomCode;
(item.ShiftTypes.DistinctBy(x => x.ShiftType).Count() != item.ShiftTypes.Count).ThrowIfTrue($"{u}的餐次不可重复添加");

3
Src/Dlhis.Canteen/Order/Services/Implements/BookingOrderService.cs
View File

@@ -14,7 +14,6 @@ using Dlhis.Basic.Api;
using Kurisu.SqlSugar.Extensions;
using SqlSugar;
using Mapster;
using MySqlX.XDevAPI.Relational;
namespace Dlhis.Canteen.Order.Services.Implements;
@@ -134,7 +133,7 @@ public class BookingOrderService : BaseOrderService, IBookingOrderService
.SetColumns(x => x.Number == menuDetail.Number)
.SetColumns(x => x.Version == x.Version + 1)
.SetColumns(x => x.ModifiedTime == now)
.Where(x => x.Date == menuDetail.Date
.Where(x => x.StartDate >= menuDetail.Date && x.EndDate <= menuDetail.Date
&& x.ShiftType == request.ShiftType
&& x.BusinessPlaceCode == request.BusinessPlaceCode
&& x.DishesCode == request.DishesCode

11
Src/Dlhis.Entity/Canteen/Entities/DishesMenuEntity.cs
View File

@@ -31,11 +31,16 @@ public class DishesMenuEntity : SugarBaseEntity, ITenantId, IVersion
public Guid BusinessPlaceCode { get; set; }
/// <summary>
/// 营业日期
/// 营业日期-开始
/// </summary>
[SugarColumn(ColumnDataType = "date", ColumnDescription = "营业日期")]
public DateTime Date { get; set; }
[SugarColumn(ColumnDescription = "营业日期开始")]
public DateTime StartDate { get; set; }
/// <summary>
/// 营业日期-结束
/// </summary>
[SugarColumn(ColumnDescription = "营业日期结束")]
public DateTime EndDate { get; set; }
/// <summary>
/// 餐次