fix 菜单明细调整
This commit is contained in:
@@ -43,12 +43,13 @@ public class DishesMenusController : ControllerBase
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="businessPlaceCode"></param>
|
/// <param name="businessPlaceCode"></param>
|
||||||
/// <param name="customCode"></param>
|
/// <param name="customCode"></param>
|
||||||
/// <param name="date"></param>
|
/// <param name="startDate"></param>
|
||||||
|
/// <param name="endDate"></param>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
[HttpGet("detail")]
|
[HttpGet("detail")]
|
||||||
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date)
|
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
|
||||||
{
|
{
|
||||||
return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, date);
|
return await _dishesMenuService.GetDishesMenuDetailAsync(businessPlaceCode, customCode, startDate, endDate);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ public interface IDishesMenuService : IScopeDependency
|
|||||||
{
|
{
|
||||||
Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request);
|
Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request);
|
||||||
|
|
||||||
Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date);
|
Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate);
|
||||||
|
|
||||||
Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode);
|
Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode);
|
||||||
|
|
||||||
|
|||||||
@@ -40,14 +40,24 @@ public class DishesMenuService : IDishesMenuService
|
|||||||
.ToPageListAsync(request);
|
.ToPageListAsync(request);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime date)
|
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
|
||||||
{
|
{
|
||||||
var data = await _dbContext.Queryable<DishesMenuEntity>()
|
var data = await _dbContext.Queryable<DishesMenuEntity>()
|
||||||
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
|
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
|
||||||
.Where(x => x.CustomCode == customCode)
|
.Where(x => x.CustomCode == customCode)
|
||||||
.Where(x => x.StartDate >= date && x.EndDate <= date)
|
.Where(x => x.StartDate == startDate)
|
||||||
|
.Where(x => x.EndDate == endDate)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
|
if (data.IsEmpty())
|
||||||
|
{
|
||||||
|
return new DishesMenuSaveRequest
|
||||||
|
{
|
||||||
|
BusinessPlaceCode = businessPlaceCode,
|
||||||
|
Items = new List<DishesMenuNameDateSaveRequest> { }
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return new DishesMenuSaveRequest
|
return new DishesMenuSaveRequest
|
||||||
{
|
{
|
||||||
BusinessPlaceCode = businessPlaceCode,
|
BusinessPlaceCode = businessPlaceCode,
|
||||||
|
|||||||
Reference in New Issue
Block a user