commitafdd9e6f14Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:48:05 2024 +0800 fix 价格默认获取菜单中的设置 commita3cfc472c8Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:40:04 2024 +0800 fix 时间范围逻辑 commit83f8906f12Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:32:55 2024 +0800 fix 时间范围逻辑 commit35660b1d0cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:29:36 2024 +0800 fix 数据范围罗逻辑修改 commit7407955bc5Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:14:06 2024 +0800 fix 分类树增加营业点参数 commited5196d1a1Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 21:02:52 2024 +0800 feat 用户创建 commitd25909a235Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:51:20 2024 +0800 fix 菜单明细调整 commit8915f9ff0fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:42:08 2024 +0800 fix 判断提前 commit45aa52aa2aAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:34:22 2024 +0800 fix 逻辑取反 commit89904fead1Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 20:23:20 2024 +0800 fix 菜单时效范围 commit573911f907Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 19:13:33 2024 +0800 fix 订单聚合返回状态 commit93c38be18aAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 18:40:12 2024 +0800 fix 订单查询 commite256d18d36Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 18:14:33 2024 +0800 fix 订单取消接口,分页权限控制 commit1218aec811Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:32:45 2024 +0800 fix 营业点权限控制优化 commit226c61ee41Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:09:42 2024 +0800 fix tenantId赋值 commit28d2c1d8d4Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 17:05:37 2024 +0800 fix ignoretenant commit5ae6dd97b4Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:53:40 2024 +0800 fix ignoretenant commit4c866eaf3fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:40:24 2024 +0800 feat 获取所有地址 commit2ca8f2db49Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:22:47 2024 +0800 fix 优化查询 commit212a1fa073Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 16:01:49 2024 +0800 fix 临时数据模拟 commit0eb76e878cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 15:48:59 2024 +0800 fix 处理删除缺少判断 commitc582fb40c0Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 15:40:22 2024 +0800 fix 查询优化 commit6d3a19b283Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:48:45 2024 +0800 fix 错误值修改 commitc39f77008dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:31:50 2024 +0800 fix 营业点控制(admin),unit返回 commita5dcab1d07Author: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:16:23 2024 +0800 fix 营业点分页控制 commit02084be82bAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 11:01:14 2024 +0800 fix 分类控制菜品获取 commit96c5c5febaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 10:39:58 2024 +0800 fix DI commit367ede2eebAuthor: liguoyang <Ligy.97@foxmail.com> Date: Thu Mar 21 10:35:24 2024 +0800 fix 订餐返回当前信息,增加数量入参和响应 commit0e1f6cb4a0Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 16:40:10 2024 +0800 fix 餐补查询代码调整 commit21fc2f78d3Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 15:52:46 2024 +0800 fix 支付批量操作 commit878b44a146Merge:a90d4e6bf5c937Author: cheche <717840555@qq.com> Date: Wed Mar 20 15:27:39 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commita90d4e66a7Author: cheche <717840555@qq.com> Date: Wed Mar 20 15:27:37 2024 +0800 fix 餐补查询及日志删除 commitbf5c937037Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 15:12:30 2024 +0800 fix 补充营业点分配权限接口 commit07672f1d32Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 13:56:33 2024 +0800 fix 优化changeDb commit7090ee4a33Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 13:41:25 2024 +0800 fix 敏感信息混淆 commit4366b68831Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 12:42:48 2024 +0800 fix 代码优化 commit03b73515b5Author: liguoyang <Ligy.97@foxmail.com> Date: Wed Mar 20 10:59:08 2024 +0800 fix tree返回营业点 commit1ce60bedc2Merge:aba4fa72d83930Author: cheche <717840555@qq.com> Date: Wed Mar 20 09:55:17 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commitaba4fa7ee9Author: cheche <717840555@qq.com> Date: Wed Mar 20 09:55:13 2024 +0800 fix 删除日志优化 commit2d8393068fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 20:53:16 2024 +0800 feat 订单聚合接口 commit0cde1d3d92Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 20:03:06 2024 +0800 fix 表名称调整 commitf003e30169Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 19:51:56 2024 +0800 fix 订餐null异常处理 commitf427338715Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 18:43:19 2024 +0800 feat 获取菜品 commit3a65d95701Merge:9a7091b7432faeAuthor: cheche <717840555@qq.com> Date: Tue Mar 19 18:36:16 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit9a7091b4e0Author: cheche <717840555@qq.com> Date: Tue Mar 19 18:36:14 2024 +0800 fix 删除日志try commit7432fae103Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 18:02:31 2024 +0800 fix 配送点增加 commitecd162c7afAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 17:51:15 2024 +0800 fix 预定就餐送货地点 commit1c7a054ed4Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 15:53:22 2024 +0800 feat 获取所有营业点接口 commit84398a566eMerge:217d9f784b4025Author: cheche <717840555@qq.com> Date: Tue Mar 19 15:26:42 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit217d9f7770Author: cheche <717840555@qq.com> Date: Tue Mar 19 15:26:40 2024 +0800 feat 配送点管理 commit84b402538eAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 14:59:21 2024 +0800 fix 菜单分页响应调整,增加详情接口 commit098d7c7e9dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 14:26:24 2024 +0800 fix 代码优化
236 lines
9.5 KiB
C#
236 lines
9.5 KiB
C#
using Dlhis.Entity.Canteen.Entities;
|
|
using Dlhis.Entity.Canteen.Enums;
|
|
using Kurisu.AspNetCore.Utils.Extensions;
|
|
using Kurisu.Core.DataAccess.Dto;
|
|
using Kurisu.SqlSugar.Extensions;
|
|
using Kurisu.SqlSugar.Services;
|
|
using SqlSugar;
|
|
using Dlhis.Basic.Dishes.Request;
|
|
using Dlhis.Basic.Dishes.Response;
|
|
using Dlhis.Basic.BusinessPlace.Services;
|
|
using Dlhis.Basic.Dishes.Dto;
|
|
using Kurisu.Core.CustomClass;
|
|
using System.Linq.Expressions;
|
|
|
|
namespace Dlhis.Basic.Dishes.Services.Implements;
|
|
|
|
public class DishesMenuService : IDishesMenuService
|
|
{
|
|
private readonly IDbContext _dbContext;
|
|
private readonly IBusinessPlacePermissionsService _businessPlacePermissionsService;
|
|
|
|
public DishesMenuService(IDbContext dbContext, IBusinessPlacePermissionsService businessPlacePermissionsService)
|
|
{
|
|
_dbContext = dbContext;
|
|
_businessPlacePermissionsService = businessPlacePermissionsService;
|
|
}
|
|
|
|
public async Task<Pagination<DishesMenuPageResponse>> GetDishesMenuPageAsync(DisheMenuPageRequest request)
|
|
{
|
|
return await _dbContext.Queryable<DishesMenuEntity>()
|
|
.Where(x => x.BusinessPlaceCode == request.BusinessPlaceCode)
|
|
.GroupBy(x => new { x.BusinessPlaceCode, x.CustomCode, x.StartDate, x.EndDate })
|
|
.Select(x => new DishesMenuPageResponse
|
|
{
|
|
BusinessPlaceCode = x.BusinessPlaceCode,
|
|
CustomCode = x.CustomCode,
|
|
StartDate = x.StartDate,
|
|
EndDate = x.EndDate,
|
|
})
|
|
.ToPageListAsync(request);
|
|
}
|
|
|
|
public async Task<DishesMenuSaveRequest> GetDishesMenuDetailAsync(Guid businessPlaceCode, string customCode, DateTime startDate, DateTime endDate)
|
|
{
|
|
var data = await _dbContext.Queryable<DishesMenuEntity>()
|
|
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
|
|
.Where(x => x.CustomCode == customCode)
|
|
.Where(x => x.StartDate == startDate)
|
|
.Where(x => x.EndDate == endDate)
|
|
.ToListAsync();
|
|
|
|
if (data.IsEmpty())
|
|
{
|
|
return new DishesMenuSaveRequest
|
|
{
|
|
BusinessPlaceCode = businessPlaceCode,
|
|
Items = new List<DishesMenuNameDateSaveRequest> { }
|
|
};
|
|
}
|
|
|
|
return new DishesMenuSaveRequest
|
|
{
|
|
BusinessPlaceCode = businessPlaceCode,
|
|
Items = new List<DishesMenuNameDateSaveRequest>
|
|
{
|
|
new()
|
|
{
|
|
CustomCode = customCode,
|
|
Period = new DateTimePeriod
|
|
{
|
|
Start = data[0].StartDate,
|
|
End = data[0].EndDate,
|
|
},
|
|
ShiftTypes = data.GroupBy(x => x.ShiftType).Select(item =>
|
|
{
|
|
var shiftType = item.Key;
|
|
|
|
return new DishesMenuShiftTypeSaveRequest
|
|
{
|
|
ShiftType = shiftType,
|
|
Dishes = item.Select(x => new MenuDishesSaveRequest
|
|
{
|
|
DishesCode = x.DishesCode,
|
|
Number = x.Number,
|
|
Price = x.Price,
|
|
}).ToList()
|
|
};
|
|
|
|
}).ToList()
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
public async Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode)
|
|
{
|
|
var data = await _dbContext.Queryable<DishesMenuEntity>()
|
|
.LeftJoin<DishesEntity>((x, dishes) => x.DishesCode == dishes.CustomCode)
|
|
.Where(x => x.BusinessPlaceCode == businessPlaceCode)
|
|
.Where(x => x.StartDate <= date && date <= x.EndDate)
|
|
.Where((x, dishes) => dishes.Enable)
|
|
.WhereIF(shiftType.HasValue, x => x.ShiftType == shiftType)
|
|
.Where((x, dishes) => dishes.CategoryCode == categoryCode)
|
|
.Select((x, dishes) => new DishesDetailResponse
|
|
{
|
|
BusinessPlaceCode = x.BusinessPlaceCode,
|
|
CategoryCode = dishes.CategoryCode,
|
|
CustomCode = dishes.CustomCode,
|
|
Description = dishes.Description,
|
|
ImageUrl = dishes.ImageUrl,
|
|
Price = SqlFunc.IIF(x.Price > 0, x.Price, dishes.Price),
|
|
Name = dishes.Name,
|
|
Number = x.Number,
|
|
CurrentUnits = dishes.Units.ToString()
|
|
})
|
|
.ToListAsync();
|
|
|
|
return data;
|
|
}
|
|
|
|
public async Task SaveDishesMenuAsync(DishesMenuSaveRequest request)
|
|
{
|
|
//检验数据
|
|
CheckDuplicateData(request);
|
|
|
|
//检验权限
|
|
var res = await _businessPlacePermissionsService.GetMyAsync();
|
|
var myBps = res.Select(x => x.Code).ToList();
|
|
|
|
myBps.Contains(request.BusinessPlaceCode).ThrowIfFalse("非经营营业点,无法保存菜单");
|
|
|
|
if (request.Items.Any())
|
|
{
|
|
Expression<Func<DishesMenuEntity, bool>> whereCheck = LinqExpressionExtension.False<DishesMenuEntity>();
|
|
request.Items.ForEach(p =>
|
|
{
|
|
whereCheck = whereCheck.Or(x => !(x.EndDate < p.Period.Start || x.StartDate > p.Period.End));
|
|
});
|
|
|
|
var duplicate = await _dbContext.Queryable<DishesMenuEntity>().Where(whereCheck).AnyAsync();
|
|
duplicate.ThrowIfTrue("菜单时效冲突");
|
|
}
|
|
|
|
var entities = request.Items.SelectMany(item =>
|
|
{
|
|
var customCode = item.CustomCode;
|
|
var period = item.Period;
|
|
|
|
return item.ShiftTypes.SelectMany(shiftTypeItem =>
|
|
{
|
|
var shiftType = shiftTypeItem.ShiftType;
|
|
|
|
return shiftTypeItem.Dishes.Select(dishesItem =>
|
|
{
|
|
var dishesCode = dishesItem.DishesCode;
|
|
var number = dishesItem.Number;
|
|
var price = dishesItem.Price;
|
|
|
|
return new DishesMenuEntity
|
|
{
|
|
BusinessPlaceCode = request.BusinessPlaceCode,
|
|
CustomCode = customCode,
|
|
StartDate = period.Start.Value,
|
|
EndDate = period.End.Value,
|
|
ShiftType = shiftType,
|
|
DishesCode = dishesCode,
|
|
Number = number,
|
|
Price = price,
|
|
|
|
Type = CanteenApplicaitonTypeEnumType.Booking,
|
|
Version = 0,
|
|
};
|
|
});
|
|
});
|
|
}).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.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);
|
|
}
|
|
|
|
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 => x.StartDate <= date && date <= x.EndDate)
|
|
.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 = date,
|
|
MenuId = x.Id,
|
|
DishesId = d.Id,
|
|
DishesCode = d.CustomCode,
|
|
DishesName = d.Name,
|
|
Price = x.Price == null || x.Price == 0 ? d.Price : x.Price.Value,
|
|
Number = x.Number,
|
|
Version = x.Version,
|
|
})
|
|
.SingleAsync();
|
|
|
|
return detail;
|
|
}
|
|
|
|
//*********************************************************help methods**********************************************************************
|
|
|
|
private static void CheckDuplicateData(DishesMenuSaveRequest request)
|
|
{
|
|
(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.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}的餐次不可重复添加");
|
|
|
|
foreach (var shiftTypeItem in item.ShiftTypes)
|
|
{
|
|
(shiftTypeItem.Dishes.DistinctBy(x => x.DishesCode).Count() != shiftTypeItem.Dishes.Count)
|
|
.ThrowIfTrue($"{u}的{shiftTypeItem.ShiftType.GetDescription()}下菜品不可重复");
|
|
}
|
|
}
|
|
}
|
|
}
|