diff --git a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs index e5808234..e8498c95 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/IBusinessPlaceShiftService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Basic.BusinessShift.Request; using Dlhis.Basic.BusinessShift.Response; diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs index dbf1d513..ef16b0b8 100644 --- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs +++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Basic.BusinessShift.Request; using Dlhis.Basic.BusinessShift.Response; diff --git a/Src/Dlhis.Basic/MealUser/Controllers/BookingAddresController.cs b/Src/Dlhis.Basic/MealUser/Controllers/BookingAddresController.cs deleted file mode 100644 index 481ea041..00000000 --- a/Src/Dlhis.Basic/MealUser/Controllers/BookingAddresController.cs +++ /dev/null @@ -1,47 +0,0 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; -using Dlhis.Basic.MealUser.Services; -using Kurisu.Core.DataAccess.Dto; -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; - -namespace Dlhis.Basic.MealUser.Controllers -{ - /// - /// 订餐地址 - /// - [Authorize] - [Route("api/[controller]")] - [ApiController] - public class BookingAddresController : ControllerBase - { - private readonly IBookingAddresService _bookingAddresService; - - public BookingAddresController(IBookingAddresService bookingAddresService) - { - _bookingAddresService = bookingAddresService; - } - - /// - /// 地址分页 - /// - /// - /// - [HttpGet("pageAddres")] - public async Task> GetAddresPageAsync([FromQuery] GetAddresPageRequest request) - { - return await _bookingAddresService.GetAddresPageRequest(request); - } - - /// - /// 地址保存 - /// - /// - /// - [HttpPost("saveAddres")] - public async Task SaveAddresAsync(SaveAddresRequest request) - { - await _bookingAddresService.SaveAddresAsync(request); - } - } -} diff --git a/Src/Dlhis.Basic/MealUser/Request/GetAddresPageRequest.cs b/Src/Dlhis.Basic/MealUser/Request/GetAddresPageRequest.cs deleted file mode 100644 index 4f290222..00000000 --- a/Src/Dlhis.Basic/MealUser/Request/GetAddresPageRequest.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Basic.MealUser.Request -{ - public class GetAddresPageRequest : PageDto - { - } -} diff --git a/Src/Dlhis.Basic/MealUser/Request/SaveAddresRequest.cs b/Src/Dlhis.Basic/MealUser/Request/SaveAddresRequest.cs deleted file mode 100644 index c40c413f..00000000 --- a/Src/Dlhis.Basic/MealUser/Request/SaveAddresRequest.cs +++ /dev/null @@ -1,16 +0,0 @@ -using SqlSugar; - -namespace Dlhis.Basic.MealUser.Request -{ - public class SaveAddresRequest - { - - public long? Id { get; set; } - - /// - /// 订餐地址 - /// - [SugarColumn(ColumnDescription = "订餐地址")] - public string Addres { get; set; } - } -} diff --git a/Src/Dlhis.Basic/MealUser/Response/GetAddresPageResponse.cs b/Src/Dlhis.Basic/MealUser/Response/GetAddresPageResponse.cs deleted file mode 100644 index ff35ae8b..00000000 --- a/Src/Dlhis.Basic/MealUser/Response/GetAddresPageResponse.cs +++ /dev/null @@ -1,15 +0,0 @@ -using SqlSugar; - -namespace Dlhis.Basic.MealUser.Response -{ - public class GetAddresPageResponse - { - public long Id { get; set; } - - /// - /// 订餐地址 - /// - public string Addres { get; set; } - - } -} diff --git a/Src/Dlhis.Basic/MealUser/Services/IBookingAddresService.cs b/Src/Dlhis.Basic/MealUser/Services/IBookingAddresService.cs deleted file mode 100644 index a8ed76e5..00000000 --- a/Src/Dlhis.Basic/MealUser/Services/IBookingAddresService.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; -using Kurisu.Core.DataAccess.Dto; - -namespace Dlhis.Basic.MealUser.Services -{ - public interface IBookingAddresService : IScopeDependency - { - Task> GetAddresPageRequest(GetAddresPageRequest request); - Task SaveAddresAsync(SaveAddresRequest request); - } -} diff --git a/Src/Dlhis.Basic/MealUser/Services/Implements/BookingAddresService.cs b/Src/Dlhis.Basic/MealUser/Services/Implements/BookingAddresService.cs deleted file mode 100644 index d70bee81..00000000 --- a/Src/Dlhis.Basic/MealUser/Services/Implements/BookingAddresService.cs +++ /dev/null @@ -1,47 +0,0 @@ -using Dlhis.Basic.MealUser.Request; -using Dlhis.Basic.MealUser.Response; -using Dlhis.Entity.Basic.Entity; -using Kurisu.AspNetCore.Utils.Extensions; -using Kurisu.Core.DataAccess.Dto; -using Kurisu.SqlSugar.Extensions; -using Kurisu.SqlSugar.Services; -using Mapster; -using Microsoft.AspNetCore.Mvc; - -namespace Dlhis.Basic.MealUser.Services.Implements -{ - public class BookingAddresService : IBookingAddresService - { - private readonly IDbContext _dbContext; - - public BookingAddresService(IDbContext dbContext) - { - _dbContext = dbContext; - } - - public async Task> GetAddresPageRequest(GetAddresPageRequest request) - { - return await _dbContext.Queryable() - .WhereIF(request.Search.IsPresent(),x=>x.Addres.Contains(request.Search)) - .Select() - .ToPageListAsync(request); - } - - public async Task SaveAddresAsync(SaveAddresRequest request) - { - if (!request.Id.HasValue) - { - var entity = request.Adapt(); - await _dbContext.InsertAsync(entity); - } - else - { - var entity = await _dbContext.Queryable() - .Where(x => x.Id == request.Id) - .FirstAsync(); - request.Adapt(entity); - await _dbContext.UpdateAsync(entity); - } - } - } -} diff --git a/Src/Dlhis.Basic/Places/Controllers/BookingAddressController.cs b/Src/Dlhis.Basic/Places/Controllers/BookingAddressController.cs new file mode 100644 index 00000000..24b717da --- /dev/null +++ b/Src/Dlhis.Basic/Places/Controllers/BookingAddressController.cs @@ -0,0 +1,46 @@ +using Dlhis.Basic.Places.Request; +using Dlhis.Basic.Places.Response; +using Dlhis.Basic.Places.Services; +using Kurisu.Core.DataAccess.Dto; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace Dlhis.Basic.Places.Controllers; + +/// +/// 订餐地址 +/// +[Authorize] +[Route("api/[controller]")] +[ApiController] +public class BookingAddressController : ControllerBase +{ + private readonly IBookingAddressService _bookingAddresService; + + public BookingAddressController(IBookingAddressService bookingAddresService) + { + _bookingAddresService = bookingAddresService; + } + + /// + /// 地址分页 + /// + /// + /// + [HttpGet("page")] + public async Task> GetAddresPageAsync([FromQuery] BookingAddressPageRequest request) + { + return await _bookingAddresService.GetAddressPageAsync(request); + } + + /// + /// 地址保存 + /// + /// + /// + [HttpPost("save")] + public async Task SaveAddresAsync(BookingAddressSaveRequest request) + { + await _bookingAddresService.SaveAddressAsync(request); + } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs similarity index 92% rename from Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs rename to Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs index 99ac821c..e9bdf549 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacePermissionsController.cs +++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Basic.BusinessPlace.Services; using Kurisu.Core.DataAccess.Dto; @@ -52,7 +52,7 @@ public class BusinessPlacePermissionsController /// [Authorize(Roles = "admin,tenant-admin")] [HttpPost("save")] - public async Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request) + public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request) { await _businessPlacePermissionsService.SaveBusinessPlacePermissionAsync(request); } diff --git a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs similarity index 98% rename from Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs rename to Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs index e9a8e1a6..249b3774 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Controllers/BusinessPlacesController.cs +++ b/Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Basic.BusinessPlace.Services; using Dlhis.Basic.BusinessShift.Services; diff --git a/Src/Dlhis.Basic/Places/Request/BookingAddressPageRequest.cs b/Src/Dlhis.Basic/Places/Request/BookingAddressPageRequest.cs new file mode 100644 index 00000000..0afa8bc4 --- /dev/null +++ b/Src/Dlhis.Basic/Places/Request/BookingAddressPageRequest.cs @@ -0,0 +1,9 @@ + + +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Basic.Places.Request; + +public class BookingAddressPageRequest : PageDto +{ +} diff --git a/Src/Dlhis.Basic/Places/Request/BookingAddressSaveRequest.cs b/Src/Dlhis.Basic/Places/Request/BookingAddressSaveRequest.cs new file mode 100644 index 00000000..0d1764d3 --- /dev/null +++ b/Src/Dlhis.Basic/Places/Request/BookingAddressSaveRequest.cs @@ -0,0 +1,11 @@ +namespace Dlhis.Basic.Places.Request; + +public class BookingAddressSaveRequest +{ + public long? Id { get; set; } + + /// + /// 订餐地址 + /// + public string Address { get; set; } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlaceGetByCodeRequest.cs similarity index 88% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlaceGetByCodeRequest.cs index 5177dd0c..53ef9a11 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetByCodeRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlaceGetByCodeRequest.cs @@ -1,7 +1,7 @@ using Kurisu.Core.DataAccess.Dto; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Basic.BusinessPlace.Request +namespace Dlhis.Basic.Places.Request { public class BusinessPlaceGetByCodeRequest : PageDto { diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlaceGetShiftsRequest.cs similarity index 85% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlaceGetShiftsRequest.cs index b2a0715e..fe12c984 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceGetShiftsRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlaceGetShiftsRequest.cs @@ -1,6 +1,6 @@ using System.ComponentModel.DataAnnotations; -namespace Dlhis.Basic.BusinessPlace.Request; +namespace Dlhis.Basic.Places.Request; public class BusinessPlaceGetShiftsRequest { diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePageRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlacePageRequest.cs similarity index 94% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePageRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlacePageRequest.cs index 0107b3ce..7fe65972 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePageRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlacePageRequest.cs @@ -2,7 +2,7 @@ using Dlhis.Entity.Canteen.Enums; using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Basic.BusinessPlace.Request; +namespace Dlhis.Basic.Places.Request; public class BusinessPlacePageRequest : PageDto { diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePermissionPageRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionPageRequest.cs similarity index 69% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePermissionPageRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionPageRequest.cs index 4efbd299..f3cdc557 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlacePermissionPageRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionPageRequest.cs @@ -1,6 +1,6 @@ using Kurisu.Core.DataAccess.Dto; -namespace Dlhis.Basic.BusinessPlace.Request; +namespace Dlhis.Basic.Places.Request; public class BusinessPlacePermissionPageRequest : PageDto { diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionSaveRequest.cs similarity index 68% rename from Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionSaveRequest.cs index 744ab2da..b6c6b4c1 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/SaveBusinessPlacePermissionRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlacePermissionSaveRequest.cs @@ -1,8 +1,6 @@ -using SqlSugar; +namespace Dlhis.Basic.Places.Request; -namespace Dlhis.Basic.BusinessPlace.Request; - -public class SaveBusinessPlacePermissionRequest +public class BusinessPlacePermissionSaveRequest { public long? Id { get; set; } diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveRequest.cs similarity index 96% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveRequest.cs index 35c7cb27..fc2c7e71 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveRequest.cs @@ -1,7 +1,7 @@ using System.ComponentModel.DataAnnotations; using Dlhis.Entity.Canteen.Enums; -namespace Dlhis.Basic.BusinessPlace.Request; +namespace Dlhis.Basic.Places.Request; /// /// 营业点保存参数 diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveShiftRequest.cs b/Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveShiftRequest.cs similarity index 83% rename from Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveShiftRequest.cs rename to Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveShiftRequest.cs index 23fc1140..5bb64cab 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/BusinessPlaceSaveShiftRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveShiftRequest.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Basic.BusinessPlace.Request; +namespace Dlhis.Basic.Places.Request; public class BusinessPlaceSaveShiftRequest { diff --git a/Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs b/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs similarity index 76% rename from Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs rename to Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs index bf940fca..56b7c5f4 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Request/DispositionDeviceRequest.cs +++ b/Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs @@ -1,4 +1,4 @@ -namespace Dlhis.Basic.BusinessPlace.Request +namespace Dlhis.Basic.Places.Request { public class DispositionDeviceRequest { diff --git a/Src/Dlhis.Basic/Places/Response/BookingAddressPageResponse.cs b/Src/Dlhis.Basic/Places/Response/BookingAddressPageResponse.cs new file mode 100644 index 00000000..9e47928e --- /dev/null +++ b/Src/Dlhis.Basic/Places/Response/BookingAddressPageResponse.cs @@ -0,0 +1,11 @@ +namespace Dlhis.Basic.Places.Response; + +public class BookingAddressPageResponse +{ + public long Id { get; set; } + + /// + /// 订餐地址 + /// + public string Address { get; set; } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs b/Src/Dlhis.Basic/Places/Response/BusinessPlaceDto.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceDto.cs rename to Src/Dlhis.Basic/Places/Response/BusinessPlaceDto.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceListResponse.cs b/Src/Dlhis.Basic/Places/Response/BusinessPlaceListResponse.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceListResponse.cs rename to Src/Dlhis.Basic/Places/Response/BusinessPlaceListResponse.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlacePermissionPageResponse.cs b/Src/Dlhis.Basic/Places/Response/BusinessPlacePermissionPageResponse.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlacePermissionPageResponse.cs rename to Src/Dlhis.Basic/Places/Response/BusinessPlacePermissionPageResponse.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs b/Src/Dlhis.Basic/Places/Response/BusinessPlaceResponse.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceResponse.cs rename to Src/Dlhis.Basic/Places/Response/BusinessPlaceResponse.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs b/Src/Dlhis.Basic/Places/Response/BusinessPlaceWithShiftResponse.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/BusinessPlaceWithShiftResponse.cs rename to Src/Dlhis.Basic/Places/Response/BusinessPlaceWithShiftResponse.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs b/Src/Dlhis.Basic/Places/Response/DeviceCodeNameDetail.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/DeviceCodeNameDetail.cs rename to Src/Dlhis.Basic/Places/Response/DeviceCodeNameDetail.cs diff --git a/Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs b/Src/Dlhis.Basic/Places/Response/GetMyResponse.cs similarity index 100% rename from Src/Dlhis.Basic/BusinessPlace/Response/GetMyResponse.cs rename to Src/Dlhis.Basic/Places/Response/GetMyResponse.cs diff --git a/Src/Dlhis.Basic/Places/Services/IBookingAddressService.cs b/Src/Dlhis.Basic/Places/Services/IBookingAddressService.cs new file mode 100644 index 00000000..9dc94951 --- /dev/null +++ b/Src/Dlhis.Basic/Places/Services/IBookingAddressService.cs @@ -0,0 +1,12 @@ +using Dlhis.Basic.Places.Request; +using Dlhis.Basic.Places.Response; +using Kurisu.Core.DataAccess.Dto; + +namespace Dlhis.Basic.Places.Services; + +public interface IBookingAddressService : IScopeDependency +{ + Task> GetAddressPageAsync(BookingAddressPageRequest request); + + Task SaveAddressAsync(BookingAddressSaveRequest request); +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs similarity index 72% rename from Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs rename to Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs index cbae1cfc..d36816ee 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Kurisu.Core.DataAccess.Dto; @@ -8,7 +8,7 @@ public interface IBusinessPlacePermissionsService : IScopeDependency { Task> GetPageAsync(BusinessPlacePermissionPageRequest request); - Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request); + Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request); Task GetMyAsync(); } diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs b/Src/Dlhis.Basic/Places/Services/IBusinessPlaceService.cs similarity index 95% rename from Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs rename to Src/Dlhis.Basic/Places/Services/IBusinessPlaceService.cs index 959cb041..ce09d910 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/IBusinessPlaceService.cs +++ b/Src/Dlhis.Basic/Places/Services/IBusinessPlaceService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Kurisu.Core.DataAccess.Dto; diff --git a/Src/Dlhis.Basic/Places/Services/Implements/BookingAddressService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BookingAddressService.cs new file mode 100644 index 00000000..22de0f58 --- /dev/null +++ b/Src/Dlhis.Basic/Places/Services/Implements/BookingAddressService.cs @@ -0,0 +1,45 @@ +using Dlhis.Basic.Places.Request; +using Dlhis.Basic.Places.Response; +using Dlhis.Entity.Basic.Entity; +using Kurisu.AspNetCore.Utils.Extensions; +using Kurisu.Core.DataAccess.Dto; +using Kurisu.SqlSugar.Extensions; +using Kurisu.SqlSugar.Services; +using Mapster; + +namespace Dlhis.Basic.Places.Services.Implements; + +public class BookingAddressService : IBookingAddressService +{ + private readonly IDbContext _dbContext; + + public BookingAddressService(IDbContext dbContext) + { + _dbContext = dbContext; + } + + public async Task> GetAddressPageAsync(BookingAddressPageRequest request) + { + return await _dbContext.Queryable() + .WhereIF(request.Search.IsPresent(), x => x.Address.Contains(request.Search)) + .Select() + .ToPageListAsync(request); + } + + public async Task SaveAddressAsync(BookingAddressSaveRequest request) + { + if (!request.Id.HasValue) + { + var entity = request.Adapt(); + await _dbContext.InsertAsync(entity); + } + else + { + var entity = await _dbContext.Queryable() + .Where(x => x.Id == request.Id) + .FirstAsync(); + request.Adapt(entity); + await _dbContext.UpdateAsync(entity); + } + } +} diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs similarity index 93% rename from Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs rename to Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs index 55d1fdca..2141ab41 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlacePermissionsService.cs +++ b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Entity.Basic.Entity; using Kurisu.Core.DataAccess.Dto; @@ -45,7 +45,7 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService return myResponse; } - public async Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request) + public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request) { var userId = _currentUser.GetIntSubjectId(); if (request.Id.HasValue) diff --git a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs similarity index 99% rename from Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs rename to Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs index 2e91ff5a..35a72463 100644 --- a/Src/Dlhis.Basic/BusinessPlace/Services/Implements/BusinessPlaceService.cs +++ b/Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs @@ -1,4 +1,4 @@ -using Dlhis.Basic.BusinessPlace.Request; +using Dlhis.Basic.Places.Request; using Dlhis.Basic.BusinessPlace.Response; using Dlhis.Entity.Basic.Entity; using Dlhis.Entity.Canteen.Enums; diff --git a/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs index 9872a497..525e27d2 100644 --- a/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs @@ -36,6 +36,11 @@ public class BookingMealRequest : IValidatableObject [EnumDataType(typeof(BalanceRecordSourceEnumType))] public BalanceRecordSourceEnumType Source { get; set; } + /// + /// 配送地址 + /// + [Required] + public string DeliveryAddress { get; set; } public IEnumerable Validate(ValidationContext validationContext) { diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs index e390d2ca..a7494d59 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/OrderService.cs @@ -102,6 +102,7 @@ public class OrderService : IOrderService CostId = gainfo.CostId, DepartmentNo = gainfo.DepartmentNo, DeviceUniqueNo = string.Empty, + DeliveryAddress = request.DeliveryAddress, No = SnowFlakeHelper.Instance.NextId().ToString(), SubsidiesFromMonth = now.ToString("yyyyMM"), diff --git a/Src/Dlhis.Entity/Basic/Entity/BookingAddresEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BookingAddresEntity.cs deleted file mode 100644 index cb39c6a4..00000000 --- a/Src/Dlhis.Entity/Basic/Entity/BookingAddresEntity.cs +++ /dev/null @@ -1,28 +0,0 @@ -using Kurisu.Core.DataAccess.Entity; -using Kurisu.SqlSugar; -using SqlSugar; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Dlhis.Entity.Basic.Entity -{ - /// - /// 就餐地址 - /// - [SugarTable(TableName = "BookingAddres", TableDescription = "就餐地址")] - public class BookingAddresEntity : SugarBaseEntity, ITenantId - { - - - /// - /// 订餐地址 - /// - [SugarColumn(ColumnDescription = "订餐地址")] - public string Addres { get; set; } - - public string TenantId { get; set; } - } -} diff --git a/Src/Dlhis.Entity/Basic/Entity/BookingAddressEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BookingAddressEntity.cs new file mode 100644 index 00000000..54e8f17a --- /dev/null +++ b/Src/Dlhis.Entity/Basic/Entity/BookingAddressEntity.cs @@ -0,0 +1,20 @@ +using Kurisu.Core.DataAccess.Entity; +using Kurisu.SqlSugar; +using SqlSugar; + +namespace Dlhis.Entity.Basic.Entity; + +/// +/// 就餐地址 +/// +[SugarTable(TableName = "BookingAddress", TableDescription = "就餐地址")] +public class BookingAddressEntity : SugarBaseEntity, ITenantId +{ + /// + /// 订餐地址 + /// + [SugarColumn(ColumnDescription = "订餐地址")] + public string Address { get; set; } + + public string TenantId { get; set; } +} diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs index 38195904..2a927612 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenOrderEntity.cs @@ -34,6 +34,12 @@ public class CanteenOrderEntity : BalanceRecordEntity [SugarColumn(ColumnDataType = "bit", ColumnDescription = "请求json")] public bool IsOffline { get; set; } + /// + /// 配送地址 + /// + [SugarColumn(ColumnDescription = "配送地址")] + public string DeliveryAddress { get; set; } + /// /// 处理结果 ///