diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesCategoryService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesCategoryService.cs index d0b12322..2164e5e0 100644 --- a/Src/Dlhis.Basic/Dishes/Services/IDishesCategoryService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/IDishesCategoryService.cs @@ -1,7 +1,7 @@ using Dlhis.Basic.Dishes.Request; using Dlhis.Basic.Dishes.Response; -namespace Dlhis.Canteen.Dishes.Services; +namespace Dlhis.Basic.Dishes.Services; public interface IDishesCategoryService : IScopeDependency { diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs index f23afb72..87c38925 100644 --- a/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/IDishesMenuService.cs @@ -4,7 +4,7 @@ using Dlhis.Basic.Dishes.Request; using Dlhis.Basic.Dishes.Dto; using Dlhis.Basic.Dishes.Response; -namespace Dlhis.Canteen.Dishes.Services; +namespace Dlhis.Basic.Dishes.Services; public interface IDishesMenuService : IScopeDependency { @@ -12,5 +12,5 @@ public interface IDishesMenuService : IScopeDependency Task SaveDishesMenuAsync(DishesMenuSaveRequest request); - Task CheckBookingAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCustomCode); + Task GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode); } diff --git a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs index 329d0e05..8398263a 100644 --- a/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/IDishesService.cs @@ -2,7 +2,7 @@ using Dlhis.Basic.Dishes.Response; using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Canteen.Dishes.Services; +namespace Dlhis.Basic.Dishes.Services; public interface IDishesService : IScopeDependency { diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs index 42530572..8fda1dc2 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesCategoryService.cs @@ -1,6 +1,5 @@ using Dlhis.Basic.Dishes.Request; using Dlhis.Basic.Dishes.Response; -using Dlhis.Canteen.Dishes.Services; using Dlhis.Entity.Canteen.Entities; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.SqlSugar.Services; diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs index 426479a3..40ffc7cf 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesMenuService.cs @@ -10,7 +10,7 @@ using Dlhis.Basic.Dishes.Response; using Dlhis.Basic.BusinessPlace.Services; using Dlhis.Basic.Dishes.Dto; -namespace Dlhis.Canteen.Dishes.Services.Implements; +namespace Dlhis.Basic.Dishes.Services.Implements; public class DishesMenuService : IDishesMenuService { @@ -85,14 +85,14 @@ public class DishesMenuService : IDishesMenuService - public async Task CheckBookingAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCustomCode) + public async Task GetBookingDishesDetailAsync(DateTime date, Guid businessPlaceCode, ShiftEnumType shiftType, string dishesCode) { var detail = await _dbContext.Queryable() .LeftJoin((x, d) => x.DishesCode == d.CustomCode) .Where(x => x.Date == date) .Where(x => x.BusinessPlaceCode == businessPlaceCode) .Where(x => x.ShiftType == shiftType) - .Where(x => x.DishesCode == dishesCustomCode) + .Where(x => x.DishesCode == dishesCode) .Where((x, d) => d.Enable) .Select((x, d) => new DishesMenuDetailDto { diff --git a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs index dad68a15..4c202176 100644 --- a/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs +++ b/Src/Dlhis.Basic/Dishes/Services/Implements/DishesService.cs @@ -1,6 +1,5 @@ using Dlhis.Basic.Dishes.Request; using Dlhis.Basic.Dishes.Response; -using Dlhis.Canteen.Dishes.Services; using Dlhis.Entity.Canteen.Entities; using Kurisu.AspNetCore.Utils.Extensions; using Kurisu.Core.DataAccess.Dto; @@ -8,7 +7,7 @@ using Kurisu.SqlSugar.Extensions; using Kurisu.SqlSugar.Services; using Mapster; -namespace Dlhis.Canteen.Dishes.Services.Implements; +namespace Dlhis.Basic.Dishes.Services.Implements; public class DishesService : IDishesService {