Merge branch 'development' of https://git.dlhis.com/liguoyang/jinko.yikatong into development

This commit is contained in:
2024-03-23 00:52:30 +08:00
9 changed files with 60 additions and 77 deletions

View File

@@ -42,11 +42,6 @@ public class DishesDetailResponse
/// </summary>
public int Number { get; set; }
/// <summary>
/// 剩余数量
/// </summary>
public int Number { get; set; }
/// <summary>
/// 单位
/// </summary>

View File

@@ -8,10 +8,6 @@ public interface IDishesCategoryService : IScopeDependency
Task<List<DishesCategoryTreeResponse>> TreeAsync(Guid businessPlaceCode);
Task<List<DishesCategoryTreeResponse>> TreeAllAsync(Guid businessPlaceCode);
Task<List<DishesCategoryTreeResponse>> TreeAllAsync(Guid businessPlaceCode);

View File

@@ -14,8 +14,6 @@ public interface IDishesMenuService : IScopeDependency
Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode);
Task<List<DishesDetailResponse>> GetDishesUnderCurrentMenuAsync(Guid businessPlaceCode, DateTime date, ShiftEnumType? shiftType, Guid categoryCode);
Task SaveDishesMenuAsync(DishesMenuSaveRequest request);
Task<DishesMenuDetailDto> GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode);

View File

@@ -17,7 +17,6 @@ public class DishesCategoryService : IDishesCategoryService
public DishesCategoryService(IDbContext dbContext, IBusinessPlacePermissionsService businessPlacePermissionsService)
{
_dbContext = dbContext;
_businessPlacePermissionsService = businessPlacePermissionsService;
}
public async Task<List<DishesCategoryTreeResponse>> TreeAsync(Guid businessPlaceCode)
@@ -49,8 +48,6 @@ public class DishesCategoryService : IDishesCategoryService
public async Task<List<DishesCategoryTreeResponse>> TreeAllAsync(Guid businessPlaceCode)
{
var mybCodes = await GetMyBusinessPlaceCodesAsync();
var categories = await _dbContext.Queryable<DishesCategoryEntity>()
.LeftJoin<BusinessPlaceEntity>((x, bplace) => x.BusinessPlaceCode == bplace.Code)
.Where(x => x.BusinessPlaceCode == businessPlaceCode)