commitee0ee9b167Merge:e78ab0bcd4888dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:07:22 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commite78ab0baeaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:06:13 2024 +0800 fix 增加权限控制 commit793a3325f2Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:24:41 2024 +0800 Squashed commit of the following: commit d4ab7d407a141b80024f85eeaab0062bea016051 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:23:30 2024 +0800 merge error commit 6204fa4ed15e0be303f7eb62307476725b8e7e36 Merge: 7290f0b aaeacf4 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:19:41 2024 +0800 Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit aaeacf4ffa778eb6a6104e2349357644d038151b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa Author: cheche <717840555@qq.com> Date: Tue Mar 12 14:00:53 2024 +0800 fix 营业点配置权限 commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920 Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit153f0ecd2aAuthor: cheche <717840555@qq.com> Date: Tue Mar 19 09:58:31 2024 +0800 fix 返回支付方式中文描述 commite548c780b8Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:59:45 2024 +0800 fix 优化送餐 commitfa376f7671Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:11:45 2024 +0800 fix 参数结构调整 commit1b58ca69bfAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:57:18 2024 +0800 fix 餐次数据补充 commite8a98c614cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:56 2024 +0800 add 补充实体变更 commit4651adedc3Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:38 2024 +0800 fix 优化查询,增加详情接口 commitad48e37273Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:09:16 2024 +0800 fix 枚举code过滤 commitabf2e2ed29Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:44:15 2024 +0800 fix 获取订餐最晚时间 commit00869111dfAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 14:21:19 2024 +0800 fix 检验权限修改 commit7b83014119Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 13:42:35 2024 +0800 fix 优化菜品保存和分页 commitfefc785b66Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:17:19 2024 +0800 fix 修改营业点返回体 commit3b7874a2a0Author: cheche <717840555@qq.com> Date: Mon Mar 18 12:14:06 2024 +0800 fix currentUser commitc825531fdaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:43 2024 +0800 fix 提交可编译版本 commit8f430bccd3Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:38 2024 +0800 fix GetDishesMenusBookingResponse修改字段 commit69c60dc459Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:59:52 2024 +0800 fix 增加日期返回 commitfadee3861aAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:31 2024 +0800 fix GetDishesMenusBookingSetting返回体修改 commit058b989eadAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 10:54:28 2024 +0800 fix 获取营业点下面餐次 commita82e7ff798Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:28:56 2024 +0800 fix 命名空间调整 commit9acdab4e01Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:27:46 2024 +0800 fix 更新控制器名称 commit3005443392Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:01:03 2024 +0800 feat 菜品/菜单配置 commita59404711cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 21:26:16 2024 +0800 feat 获取服务时间 commitba0fe3e67fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 20:58:11 2024 +0800 fix 处理next空数组 commit97fb157c9fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 20:49:44 2024 +0800 fix 营业点权限调整 commit70420b9668Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:54:15 2024 +0800 fix 修改IBusinessPlacePermissionsService commit6f2383c663Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:47:33 2024 +0800 fix api commit99e1c8f125Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 18:03:09 2024 +0800 fix 实体变更 commitd327e9e3aaAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 16:06:17 2024 +0800 fix 临时修改送餐代码 commit4825648e41Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:53 2024 +0800 fix 按基地分配获取值错误 commit8ed8addbf3Author: cheche <717840555@qq.com> Date: Fri Mar 15 15:10:55 2024 +0800 fix 表增加ITenantid commitcd4888d900Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 12:06:13 2024 +0800 fix 增加权限控制 commit1cd9b2467eAuthor: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:24:41 2024 +0800 Squashed commit of the following: commit d4ab7d407a141b80024f85eeaab0062bea016051 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:23:30 2024 +0800 merge error commit 6204fa4ed15e0be303f7eb62307476725b8e7e36 Merge: 7290f0b aaeacf4 Author: liguoyang <Ligy.97@foxmail.com> Date: Tue Mar 19 10:19:41 2024 +0800 Merge branch 'feat-PlacePermission' of https://git.dlhis.com/liguoyang/jinko.yikatong into feat-PlacePermission commit 7290f0bd822c0e2bd957908fd58f6e99f22ad46b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 41b94fa3a9596a38cda1b4bf4f345ce13fe5677a Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commit aaeacf4ffa778eb6a6104e2349357644d038151b Author: cheche <717840555@qq.com> Date: Tue Mar 12 15:05:28 2024 +0800 fix 获取用户权限设备 优化 commit 9e6099c52d0318cba35e7c082cb4d3085b46b0fa Author: cheche <717840555@qq.com> Date: Tue Mar 12 14:00:53 2024 +0800 fix 营业点配置权限 commit b4565e34f48da0e5ef1d3dffa59d0ccf0d950920 Author: cheche <717840555@qq.com> Date: Tue Mar 12 13:13:23 2024 +0800 fix 第一 commited25ab626aAuthor: cheche <717840555@qq.com> Date: Tue Mar 19 09:58:31 2024 +0800 fix 返回支付方式中文描述 commitc4b48131d2Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:59:45 2024 +0800 fix 优化送餐 commit8f26e7e84bAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 16:11:45 2024 +0800 fix 参数结构调整 commit8307d1d941Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:57:18 2024 +0800 fix 餐次数据补充 commit068a5b9507Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:56 2024 +0800 add 补充实体变更 commit805f0f83d1Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:11:38 2024 +0800 fix 优化查询,增加详情接口 commit9ef57fba55Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 15:09:16 2024 +0800 fix 枚举code过滤 commit0124fa4bc9Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:44:15 2024 +0800 fix 获取订餐最晚时间 commitfd4a925b4aAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 14:21:19 2024 +0800 fix 检验权限修改 commite6dee2d504Merge:2cbf894b3b9962Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:18:15 2024 +0800 fix 解决dishersservice冲突 commit2cbf894ea8Author: cheche <717840555@qq.com> Date: Mon Mar 18 14:17:19 2024 +0800 fix 修改营业点返回体 commitb3b99623e3Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 13:42:35 2024 +0800 fix 优化菜品保存和分页 commitfcc1f134edAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 12:14:06 2024 +0800 fix currentUser commit253caf26c1Merge:c743d2d63ded81Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:41 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commitc743d2d1c5Author: cheche <717840555@qq.com> Date: Mon Mar 18 11:48:38 2024 +0800 fix GetDishesMenusBookingResponse修改字段 commit63ded819c5Merge:5fe41043b46ac2Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:45 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit5fe4104ff6Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 11:03:43 2024 +0800 fix 提交可编译版本 commit3b46ac25a7Merge:11a3a0aa2eca2cAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:33 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit11a3a0adedAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 11:01:31 2024 +0800 fix GetDishesMenusBookingSetting返回体修改 commita2eca2cdebAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:59:52 2024 +0800 fix 增加日期返回 commit0bed0bc97bAuthor: cheche <717840555@qq.com> Date: Mon Mar 18 10:54:28 2024 +0800 fix 获取营业点下面餐次 commitc1d84ae1c6Author: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:28:56 2024 +0800 fix 命名空间调整 commite2cc31003fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:27:46 2024 +0800 fix 更新控制器名称 commitab406adecfAuthor: liguoyang <Ligy.97@foxmail.com> Date: Mon Mar 18 10:01:03 2024 +0800 feat 菜品/菜单配置 commit6ba2d7d6a2Author: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 21:26:16 2024 +0800 feat 获取服务时间 commit6872518b65Author: liguoyang <Ligy.97@foxmail.com> Date: Sun Mar 17 20:58:11 2024 +0800 fix 处理next空数组 commit423d90bf3dAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 20:49:44 2024 +0800 fix 营业点权限调整 commit220ff2d963Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:54:15 2024 +0800 fix 修改IBusinessPlacePermissionsService commit72f93a59a6Author: cheche <717840555@qq.com> Date: Fri Mar 15 18:47:33 2024 +0800 fix api commit149660ca0fAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 18:03:09 2024 +0800 fix 实体变更 commit9a84143315Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 16:06:17 2024 +0800 fix 临时修改送餐代码 commit328ef5f42cAuthor: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:53 2024 +0800 fix 按基地分配获取值错误 commitea4a15c44bMerge:a3112eb255f4b4Author: liguoyang <Ligy.97@foxmail.com> Date: Fri Mar 15 15:13:37 2024 +0800 Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development commit255f4b4a13Author: cheche <717840555@qq.com> Date: Fri Mar 15 15:10:55 2024 +0800 fix 表增加ITenantid
122 lines
4.2 KiB
C#
122 lines
4.2 KiB
C#
using Dlhis.Basic.Dishes.Request;
|
|
using Dlhis.Basic.Dishes.Response;
|
|
using Dlhis.Entity.Basic.Entity;
|
|
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 Mapster;
|
|
using System.Collections.Generic;
|
|
using System.Globalization;
|
|
|
|
namespace Dlhis.Basic.Dishes.Services.Implements;
|
|
|
|
public class DishesService : IDishesService
|
|
{
|
|
private readonly IDbContext _dbContext;
|
|
private readonly IConfiguration _configuration;
|
|
|
|
public DishesService(IDbContext dbContext, IConfiguration configuration)
|
|
{
|
|
_dbContext = dbContext;
|
|
_configuration = configuration;
|
|
}
|
|
|
|
public async Task<Pagination<DishesResponse>> GetDishesPageAsync(DishesPageRequest request)
|
|
{
|
|
//todo 营业点权限
|
|
|
|
return await _dbContext.Queryable<DishesEntity>()
|
|
.LeftJoin<DishesCategoryEntity>((x, category) => x.CategoryCode == category.Code)
|
|
.WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search || x.Name.Contains(request.Search))
|
|
.WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode))
|
|
.OrderBy(x => x.CreateTime, SqlSugar.OrderByType.Desc)
|
|
.Select((x, category) => new DishesResponse
|
|
{
|
|
CurrnetUnits = x.Units.ToString(),
|
|
CategoryName = category.Name,
|
|
|
|
}, true)
|
|
.ToPageListAsync(request);
|
|
}
|
|
|
|
|
|
public async Task SaveDishesAsync(DishesSaveRequest request)
|
|
{
|
|
if (!request.Id.HasValue)
|
|
{
|
|
var dishers = request.Adapt<DishesEntity>();
|
|
dishers.CustomCode = request.CustomCode;
|
|
await _dbContext.InsertAsync(dishers);
|
|
}
|
|
else
|
|
{
|
|
var entity = await _dbContext.Queryable<DishesEntity>().Where(x => x.Id == request.Id).FirstAsync();
|
|
entity.ThrowIfNull("菜品不存在,无法更新");
|
|
|
|
request.Adapt(entity);
|
|
await _dbContext.UpdateAsync(entity);
|
|
}
|
|
}
|
|
|
|
public async Task<GetDishesMenusBookingResponse> GetDishesMenusBookingSetting(GetDishesMenusBookingRequest request)
|
|
{
|
|
// 读取最晚订餐的时间
|
|
var strDatetime = await _dbContext.Queryable<CanteenSettingEntity>()
|
|
.Where(x => x.UniqueType == CanteenSettingUnqiueEnumType.Tenant && x.Item == CanteenSettingItemEnumType.BookingDeadline && x.Enable)
|
|
.Select(x => x.Value)
|
|
.FirstAsync();
|
|
|
|
DateTime dateTime;
|
|
DateTime.TryParseExact(strDatetime, "HH:mm:ss", null, System.Globalization.DateTimeStyles.None, out dateTime);
|
|
|
|
var res = new GetDishesMenusBookingResponse
|
|
{
|
|
ServiceTime = dateTime,
|
|
};
|
|
|
|
var shift = await _dbContext.Queryable<BusinessPlaceShiftRelationshipEntity>()
|
|
.Where(x => x.PlaceCode == request.PlaceCode)
|
|
.FirstAsync();
|
|
|
|
var payTypes = new List<BalanceRecordSourceEnumDto>();
|
|
var dto1 = new BalanceRecordSourceEnumDto
|
|
{
|
|
Type = BalanceRecordSourceEnumType.Cash
|
|
};
|
|
payTypes.Add(dto1);
|
|
|
|
if (shift != null)
|
|
{
|
|
var businessShiftMealRelationships = await _dbContext.Queryable<BusinessShiftMealRelationshipEntity>()
|
|
.Where(x => x.ShiftCode == shift.ShiftCode)
|
|
.Select<BusinessShiftMealRelationshipResponse>()
|
|
.ToListAsync();
|
|
res.BusinessShiftMealRelationships = businessShiftMealRelationships;
|
|
|
|
if (shift.TenantId == request.Factory)
|
|
{
|
|
var dto2 = new BalanceRecordSourceEnumDto
|
|
{
|
|
Type = BalanceRecordSourceEnumType.LocalTenantSubsidies
|
|
};
|
|
payTypes.Add(dto2);
|
|
}
|
|
|
|
}
|
|
res.PayTypes = payTypes;
|
|
return res;
|
|
}
|
|
|
|
public async Task<DishesDetailResponse> GetDishesDetailByIdAsync(long id)
|
|
{
|
|
return await _dbContext.Queryable<DishesEntity>()
|
|
.Where(x => x.Id == id)
|
|
.Select<DishesDetailResponse>()
|
|
.SingleAsync();
|
|
}
|
|
}
|
|
|