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

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;

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;

Src/Dlhis.Basic/MealUser/Controllers/BookingAddresController.cs

@@ -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
-{
-    /// <summary>
-    /// 订餐地址
-    /// </summary>
-    [Authorize]
-    [Route("api/[controller]")]
-    [ApiController]
-    public class BookingAddresController : ControllerBase
-    {
-        private readonly IBookingAddresService _bookingAddresService;
-
-        public BookingAddresController(IBookingAddresService bookingAddresService)
-        {
-            _bookingAddresService = bookingAddresService;
-        }
-
-        /// <summary>
-        /// 地址分页
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpGet("pageAddres")]
-        public async Task<Pagination<GetAddresPageResponse>> GetAddresPageAsync([FromQuery] GetAddresPageRequest request)
-        {
-            return await _bookingAddresService.GetAddresPageRequest(request);
-        }
-
-        /// <summary>
-        /// 地址保存
-        /// </summary>
-        /// <param name="request"></param>
-        /// <returns></returns>
-        [HttpPost("saveAddres")]
-        public async Task SaveAddresAsync(SaveAddresRequest request)
-        {
-            await _bookingAddresService.SaveAddresAsync(request);
-        }
-    }
-}

Src/Dlhis.Basic/MealUser/Request/GetAddresPageRequest.cs

@@ -1,8 +0,0 @@
-using Kurisu.Core.DataAccess.Dto;
-
-namespace Dlhis.Basic.MealUser.Request
-{
-    public class GetAddresPageRequest : PageDto
-    {
-    }
-}

Src/Dlhis.Basic/MealUser/Request/SaveAddresRequest.cs

@@ -1,16 +0,0 @@
-using SqlSugar;
-
-namespace Dlhis.Basic.MealUser.Request
-{
-    public class SaveAddresRequest
-    {
-
-        public long? Id { get; set; }
-
-        /// <summary>
-        /// 订餐地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "订餐地址")]
-        public string Addres { get; set; }
-    }
-}

Src/Dlhis.Basic/MealUser/Response/GetAddresPageResponse.cs

@@ -1,15 +0,0 @@
-using SqlSugar;
-
-namespace Dlhis.Basic.MealUser.Response
-{
-    public class GetAddresPageResponse
-    {
-        public long Id { get; set; }
-
-        /// <summary>
-        /// 订餐地址
-        /// </summary>
-        public string Addres { get; set; }
-
-    }
-}

Src/Dlhis.Basic/MealUser/Services/IBookingAddresService.cs

@@ -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<Pagination<GetAddresPageResponse>> GetAddresPageRequest(GetAddresPageRequest request);
-        Task SaveAddresAsync(SaveAddresRequest request);
-    }
-}

Src/Dlhis.Basic/MealUser/Services/Implements/BookingAddresService.cs

@@ -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<Pagination<GetAddresPageResponse>> GetAddresPageRequest(GetAddresPageRequest request)
-        {
-            return await _dbContext.Queryable<BookingAddresEntity>()
-                .WhereIF(request.Search.IsPresent(),x=>x.Addres.Contains(request.Search))
-                .Select<GetAddresPageResponse>()
-                .ToPageListAsync(request);
-        }
-
-        public async Task SaveAddresAsync(SaveAddresRequest request)
-        {
-            if (!request.Id.HasValue)
-            {
-                var entity = request.Adapt<BookingAddresEntity>();
-                await _dbContext.InsertAsync(entity);
-            }
-            else
-            {
-                var entity = await _dbContext.Queryable<BookingAddresEntity>()
-                    .Where(x => x.Id == request.Id)
-                    .FirstAsync();
-                request.Adapt(entity);
-                await _dbContext.UpdateAsync(entity);
-            }
-        }
-    }
-}

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;
+
+/// <summary>
+/// 订餐地址
+/// </summary>
+[Authorize]
+[Route("api/[controller]")]
+[ApiController]
+public class BookingAddressController : ControllerBase
+{
+    private readonly IBookingAddressService _bookingAddresService;
+
+    public BookingAddressController(IBookingAddressService bookingAddresService)
+    {
+        _bookingAddresService = bookingAddresService;
+    }
+
+    /// <summary>
+    /// 地址分页
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpGet("page")]
+    public async Task<Pagination<BookingAddressPageResponse>> GetAddresPageAsync([FromQuery] BookingAddressPageRequest request)
+    {
+        return await _bookingAddresService.GetAddressPageAsync(request);
+    }
+
+    /// <summary>
+    /// 地址保存
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost("save")]
+    public async Task SaveAddresAsync(BookingAddressSaveRequest request)
+    {
+        await _bookingAddresService.SaveAddressAsync(request);
+    }
+}

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
     /// <returns></returns>
     [Authorize(Roles = "admin,tenant-admin")]
     [HttpPost("save")]
-    public async Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request)
+    public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request)
     {
         await _businessPlacePermissionsService.SaveBusinessPlacePermissionAsync(request);
     }

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;

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
+{
+}

Src/Dlhis.Basic/Places/Request/BookingAddressSaveRequest.cs

@@ -0,0 +1,11 @@
+namespace Dlhis.Basic.Places.Request;
+
+public class BookingAddressSaveRequest
+{
+    public long? Id { get; set; }
+
+    /// <summary>
+    /// 订餐地址
+    /// </summary>
+    public string Address { get; set; }
+}

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
     {

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
 {

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
 {

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
 {

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; }
 

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;
 
 /// <summary>
 /// 营业点保存参数

Src/Dlhis.Basic/Places/Request/BusinessPlaceSaveShiftRequest.cs

@@ -1,4 +1,4 @@
-namespace Dlhis.Basic.BusinessPlace.Request;
+namespace Dlhis.Basic.Places.Request;
 
 public class BusinessPlaceSaveShiftRequest
 {

Src/Dlhis.Basic/Places/Request/DispositionDeviceRequest.cs

@@ -1,4 +1,4 @@
-namespace Dlhis.Basic.BusinessPlace.Request
+namespace Dlhis.Basic.Places.Request
 {
     public class DispositionDeviceRequest
     {

Src/Dlhis.Basic/Places/Response/BookingAddressPageResponse.cs

@@ -0,0 +1,11 @@
+namespace Dlhis.Basic.Places.Response;
+
+public class BookingAddressPageResponse
+{
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 订餐地址
+    /// </summary>
+    public string Address { get; set; }
+}

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<Pagination<BookingAddressPageResponse>> GetAddressPageAsync(BookingAddressPageRequest request);
+
+    Task SaveAddressAsync(BookingAddressSaveRequest request);
+}

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<Pagination<BusinessPlacePermissionPageResponse>> GetPageAsync(BusinessPlacePermissionPageRequest request);
 
-    Task SaveBusinessPlacePermissionAsync(SaveBusinessPlacePermissionRequest request);
+    Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request);
 
     Task<GetMyResponse> GetMyAsync();
 }

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;
 

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<Pagination<BookingAddressPageResponse>> GetAddressPageAsync(BookingAddressPageRequest request)
+    {
+        return await _dbContext.Queryable<BookingAddressEntity>()
+            .WhereIF(request.Search.IsPresent(), x => x.Address.Contains(request.Search))
+            .Select<BookingAddressPageResponse>()
+            .ToPageListAsync(request);
+    }
+
+    public async Task SaveAddressAsync(BookingAddressSaveRequest request)
+    {
+        if (!request.Id.HasValue)
+        {
+            var entity = request.Adapt<BookingAddressEntity>();
+            await _dbContext.InsertAsync(entity);
+        }
+        else
+        {
+            var entity = await _dbContext.Queryable<BookingAddressEntity>()
+                .Where(x => x.Id == request.Id)
+                .FirstAsync();
+            request.Adapt(entity);
+            await _dbContext.UpdateAsync(entity);
+        }
+    }
+}

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)

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;

Src/Dlhis.Canteen/Order/Request/BookingMealRequest.cs

@@ -36,6 +36,11 @@ public class BookingMealRequest : IValidatableObject
     [EnumDataType(typeof(BalanceRecordSourceEnumType))]
     public BalanceRecordSourceEnumType Source { get; set; }
 
+    /// <summary>
+    /// 配送地址
+    /// </summary>
+    [Required]
+    public string DeliveryAddress { get; set; }
 
     public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
     {

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"),

Src/Dlhis.Entity/Basic/Entity/BookingAddresEntity.cs

@@ -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
-{
-    /// <summary>
-    /// 就餐地址
-    /// </summary>
-    [SugarTable(TableName = "BookingAddres", TableDescription = "就餐地址")]
-    public class BookingAddresEntity : SugarBaseEntity, ITenantId
-    {
-
-
-        /// <summary>
-        /// 订餐地址
-        /// </summary>
-        [SugarColumn(ColumnDescription = "订餐地址")]
-        public string Addres { get; set; }
-
-        public string TenantId { get; set; }
-    }
-}

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;
+
+/// <summary>
+/// 就餐地址
+/// </summary>
+[SugarTable(TableName = "BookingAddress", TableDescription = "就餐地址")]
+public class BookingAddressEntity : SugarBaseEntity, ITenantId
+{
+    /// <summary>
+    /// 订餐地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "订餐地址")]
+    public string Address { get; set; }
+
+    public string TenantId { get; set; }
+}

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; }
 
+    /// <summary>
+    /// 配送地址
+    /// </summary>
+    [SugarColumn(ColumnDescription = "配送地址")]
+    public string DeliveryAddress { get; set; }
+
     /// <summary>
     /// 处理结果
     /// </summary>