From 8ed8addbf377d6a2b3d75599fc860801d8e64218 Mon Sep 17 00:00:00 2001 From: cheche <717840555@qq.com> Date: Fri, 15 Mar 2024 15:10:55 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=A1=A8=E5=A2=9E=E5=8A=A0ITenantid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Request/GetMiniProgramOrderRequest.cs | 4 ---- .../Order/Response/GetDetailResponse.cs | 2 +- .../Order/Response/GetDishesResponse.cs | 9 ++++---- .../Services/Implements/MenuDishesService.cs | 21 +++++++++++++------ .../MiniProgramOrderDetailService.cs | 5 ++--- .../appsettings.Development.json | 3 ++- .../Canteen/Entities/CanteenDishesEntity.cs | 5 ++++- .../Canteen/Entities/CanteenMenuEntity.cs | 4 +++- .../Entities/MiniProgramOrderEntity.cs | 5 ++++- .../Canteen/Entities/OrderDetailsEntity.cs | 5 ++++- 10 files changed, 40 insertions(+), 23 deletions(-) diff --git a/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs index 98bdea14..dbbbdea8 100644 --- a/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/GetMiniProgramOrderRequest.cs @@ -4,9 +4,5 @@ namespace Dlhis.Canteen.Order.Request { public class GetMiniProgramOrderRequest : PageDto { - /// - /// 用餐日期 - /// - public DateOnly? SysDate { get; set; } } } diff --git a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs index 1b78423e..0017a076 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetDetailResponse.cs @@ -15,7 +15,7 @@ namespace Dlhis.Canteen.Order.Response /// /// 营业日 /// - public DateOnly BusinessDate { get; set; } + public DateOnly SysDate { get; set; } /// /// 餐次 diff --git a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs index 4d149b01..f8da22a9 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs @@ -1,13 +1,10 @@ using Dlhis.Entity.Canteen.Enums; -using SqlSugar.DbConvert; -using SqlSugar; using Kurisu.AspNetCore.Utils.Extensions; namespace Dlhis.Canteen.Order.Response { public class GetDishesResponse { - /// /// 大类 /// @@ -53,7 +50,6 @@ namespace Dlhis.Canteen.Order.Response /// public string Unit { get; set; } - /// /// 图片 /// @@ -63,5 +59,10 @@ namespace Dlhis.Canteen.Order.Response /// 是否启用 /// public bool Enable { get; set; } + + /// + /// 限售份数 + /// + public int? RestrictedNum { get; set; } = null; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs index a5965110..22aa2eb9 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs @@ -32,7 +32,6 @@ namespace Dlhis.Canteen.Order.Services.Implements .Select((x,place) => new GetMenuResponse { ShiftTypesSrt = x.ShiftTypes.ToString(), - //ShiftTypesSrt = string.Join(", ", x.ShiftTypes.Select(enumValue => enumValue.GetDescription())), PlaceName = place.Name, },true) .ToPageListAsync(request); @@ -70,14 +69,24 @@ namespace Dlhis.Canteen.Order.Services.Implements } else { - var disCodes = await _dbContext.Queryable() - .Where(x => x.MenuCode == request.MenuCode) - .Select(x => x.DishersCode) + var relas = await _dbContext.Queryable() + .Where(x => x.MenuCode == request.MenuCode) .ToListAsync(); - return await _dbContext.Queryable() - .Where(x => disCodes.Contains(x.Code)) + + var disCodes = relas.Select(x => x.DishersCode).ToList(); + + var page = await _dbContext.Queryable() + .Where(discher => disCodes.Contains(discher.Code)) .Select() .ToPageListAsync(request); + + foreach (var res in page.Data) + { + res.RestrictedNum = relas.Where(x => x.DishersCode == res.Code) + .Select(x => x.RestrictedNum) + .FirstOrDefault(); + } + return page; } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs index 9c31e57e..7865befd 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs @@ -31,7 +31,6 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService .LeftJoin((order, place,dishers) => order.DishesCode == dishers.Code) .LeftJoin((order, place, dishers,depart) => order.DepartmentNo == depart.No) .WhereIF(!request.Search.IsEmpty(), order => order.Name == request.Search || order.Code == request.Search) - .WhereIF(request.SysDate.HasValue,order=>order.SysDate == request.SysDate) .OrderBy(order => order.CostDate,SqlSugar.OrderByType.Desc) .Select((order, place, dishers, depart) => new GetMiniProgramOrderResponse { @@ -113,7 +112,7 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService flag.ThrowIfTrue($"工号:{request.UserCode} 姓名:{gainfo.Name} 已经定过{tomorrow}的{request.ShiftType.GetDescription()}!"); //支付方式 - /* var result = await _tenantApi.GetTenantTreeAsync(); + var result = await _tenantApi.GetTenantTreeAsync(); var tree = result.Data; var shanxi = tree.Where(x => x.Name == "山西基地").FirstOrDefault(); var codes = shanxi.Next.Select(x => x.Code).ToList(); @@ -123,7 +122,7 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService { true.ThrowIfTrue($"非山西，支付方式不能为{request.PayType.GetDescription()}"); } - }*/ + } //生成订单 var order = new MiniProgramOrderEntity diff --git a/Src/Dlhis.Canteen/appsettings.Development.json b/Src/Dlhis.Canteen/appsettings.Development.json index 69b2958a..49e0aa9e 100644 --- a/Src/Dlhis.Canteen/appsettings.Development.json +++ b/Src/Dlhis.Canteen/appsettings.Development.json @@ -7,7 +7,8 @@ }, "InternalRequest": { "CommonRequestUrl": "http://localhost:5001", - "BasicRequestUrl": "http://localhost:5002" + "BasicRequestUrl": "http://localhost:5002", + "SysRequestUrl": "http://localhost:5003" }, "SwaggerOptions": { "Enable": true, diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs index 25dfd418..f313f008 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Canteen.Enums; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; @@ -14,7 +15,7 @@ namespace Dlhis.Entity.Canteen.Entities /// 菜品表 /// [SugarTable(TableName = "CanteenDishes", TableDescription = "菜品表")] - public class CanteenDishesEntity : SugarBaseEntity + public class CanteenDishesEntity : SugarBaseEntity, ITenantId { /// @@ -76,5 +77,7 @@ namespace Dlhis.Entity.Canteen.Entities /// [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")] public bool Enable { get; set; } + + public string TenantId { get; set; } } } diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs index 03461d3a..77b12057 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Canteen.Enums; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; @@ -8,7 +9,7 @@ namespace Dlhis.Entity.Canteen.Entities; /// 菜单表 /// [SugarTable(TableName = "CanteenMenu", TableDescription = "菜单表")] -public class CanteenMenuEntity : SugarBaseEntity +public class CanteenMenuEntity : SugarBaseEntity, ITenantId { /// @@ -53,6 +54,7 @@ public class CanteenMenuEntity : SugarBaseEntity /// [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")] public bool Enable { get; set; } + public string TenantId { get; set; } } diff --git a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs index 13ba9fed..91b3b525 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Canteen.Enums; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; @@ -9,7 +10,7 @@ namespace Dlhis.Entity.Canteen.Entities /// 小程序订单表 /// [SugarTable(TableName = "MiniProgramOrder", TableDescription = "小程序订单表")] - public class MiniProgramOrderEntity : SugarBaseEntity + public class MiniProgramOrderEntity : SugarBaseEntity, ITenantId { /// /// 订单号 @@ -118,5 +119,7 @@ namespace Dlhis.Entity.Canteen.Entities /// [SugarColumn(ColumnDescription = "总金额")] public decimal TotalAmount { get; set; } + + public string TenantId { get; set; } } } diff --git a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs index 7ba082e5..518305cb 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Canteen.Enums; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; @@ -9,7 +10,7 @@ namespace Dlhis.Entity.Canteen.Entities /// 订餐明细表 /// [SugarTable(TableName = "OrderDetails", TableDescription = "订餐明细表")] - public class OrderDetailsEntity : SugarBaseEntity + public class OrderDetailsEntity : SugarBaseEntity, ITenantId { /// /// 订单号 @@ -70,5 +71,7 @@ namespace Dlhis.Entity.Canteen.Entities /// [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单明细状态")] public OrderDetailsStatusEnumType OrderStatus { get; set; } + + public string TenantId { get; set; } } }