diff --git a/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs b/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs index 07863df5..c2abba2b 100644 --- a/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs +++ b/Src/Dlhis.Canteen/Order/Request/DispositionDishesDto.cs @@ -2,7 +2,7 @@ { public class DispositionDishesDto { - public Guid DisherCode { get; set; } + public string DisherCode { get; set; } public int RestrictedNum { get; set; } diff --git a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs b/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs index 4d8b9cc2..28481cb8 100644 --- a/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/OrderRequest.cs @@ -35,7 +35,7 @@ namespace Dlhis.Canteen.Order.Request /// /// 菜品 /// - public Guid DishesCode { get; set; } + public string DishesCode { get; set; } /// /// 数量 diff --git a/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs b/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs index f68b41e1..1e6ac4a3 100644 --- a/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/SaveDishesRequest.cs @@ -1,59 +1,51 @@ -using Dlhis.Entity.Canteen.Enums; -using SqlSugar.DbConvert; -using SqlSugar; -using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Order.Request; + +public class SaveDishesRequest { - public class SaveDishesRequest - { + public long? Id { get; set; } - public long? Id { get; set; } + /// + /// 大类 + /// + public string PCategory { get; set; } - /// - /// 大类 - /// - public string Categories { get; set; } + /// ` + /// 小类 + /// + [Required] + public string Category { get; set; } - /// - /// 小类 - /// - public string SubCategories { get; set; } + /// + /// 菜品名称 + /// + [Required] + public string Name { get; set; } - /// - /// 菜品名称 - /// - public string Name { get; set; } - /// - /// 类型 - /// - [EnumDataType(typeof(CanteenDishesEnumType))] - public CanteenDishesEnumType Type { get; set; } + [Required] + public string CustomCode { get; set; } - /// - /// 描述 - /// - public string Description { get; set; } + /// + /// 描述 + /// + public string Description { get; set; } - /// - /// 单价 - /// - public decimal Amount { get; set; } + /// + /// 单价 + /// + [Range(0, 10000)] + public decimal Price { get; set; } - /// - /// 单位 - /// - public string Unit { get; set; } - /// - /// 图片 - /// - public string Image { get; set; } + /// + /// 图片 + /// + public string ImageUrl { get; set; } - /// - /// 是否启用 - /// - public bool Enable { get; set; } - } + /// + /// 是否启用 + /// + public bool Enable { get; set; } } diff --git a/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs b/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs index 76e7d66e..079707c4 100644 --- a/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs +++ b/Src/Dlhis.Canteen/Order/Request/SaveMenuRequest.cs @@ -1,44 +1,39 @@ using Dlhis.Entity.Canteen.Enums; -using Dlhis.Entity.Device.Enums; -using SqlSugar; using System.ComponentModel.DataAnnotations; -namespace Dlhis.Canteen.Order.Request +namespace Dlhis.Canteen.Order.Request; + +public class SaveMenuRequest : IValidatableObject { - public class SaveMenuRequest + /// + /// 所属营业点 + /// + public Guid PlaceCode { get; set; } + + /// + /// 菜单名称 + /// + public string Name { get; set; } + + + + + /// + /// 营业日期,不能小于等于当天 + /// + public DateTime Date { get; set; } + + + /// + /// 餐次段 + /// + public ShiftEnumType ShiftType { get; set; } + + + + + public IEnumerable Validate(ValidationContext validationContext) { - public long? Id { get; set; } - - /// - /// 菜单名称 - /// - public string Name { get; set; } - - /// - /// 所属营业点 - /// - [Required] - public Guid PlaceCode { get; set; } - - /// - /// 厂区 - /// - public string Factory { get; set; } - - /// - /// 营业日期 - /// - public DateOnly StartDate { get; set; } - - - /// - /// 餐次段 - /// - public List ShiftTypes { get; set; } - - /// - /// 是否启用 - /// - public bool Enable { get; set; } + throw new NotImplementedException(); } } diff --git a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs index f8da22a9..4705e15f 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetDishesResponse.cs @@ -18,7 +18,7 @@ namespace Dlhis.Canteen.Order.Response /// /// 菜品编码 /// - public Guid Code { get; set; } + public string Code { get; set; } /// /// 菜品名称 @@ -28,7 +28,7 @@ namespace Dlhis.Canteen.Order.Response /// /// 菜品类型 /// - public CanteenDishesEnumType Type { get; set; } + public CanteenMenuEnumType Type { get; set; } /// /// 菜品类型描述 diff --git a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs index 5fcd6a2b..a0a28732 100644 --- a/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs +++ b/Src/Dlhis.Canteen/Order/Response/GetMiniProgramOrderResponse.cs @@ -120,7 +120,7 @@ namespace Dlhis.Canteen.Order.Response /// /// 订单类型 /// - public CanteenDishesEnumType OrderType { get; set; } + public CanteenMenuEnumType OrderType { get; set; } /// /// 订单类型CN diff --git a/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs index 020b5bed..025f0325 100644 --- a/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs +++ b/Src/Dlhis.Canteen/Order/Services/IMenuDishesService.cs @@ -1,7 +1,6 @@ using Dlhis.Canteen.Order.Request; using Dlhis.Canteen.Order.Response; using Kurisu.Core.DataAccess.Dto; -using Microsoft.AspNetCore.Mvc; namespace Dlhis.Canteen.Order.Services { @@ -14,7 +13,5 @@ namespace Dlhis.Canteen.Order.Services Task> GetDishesAsync(GetDishesRequest request); Task SaveDishesAsync(SaveDishesRequest request); - - Task DispositionDishesAsync(DispositionDishesRequest request); } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs index 22aa2eb9..2fc79323 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MenuDishesService.cs @@ -24,16 +24,16 @@ namespace Dlhis.Canteen.Order.Services.Implements public async Task> GetMenuAsync(GetMenuRequest request) { + var page = await _dbContext.Queryable() - .LeftJoin((x,place) => x.PlaceCode == place.Code) - .WhereIF(!request.Factory.IsEmpty(),x => x.Factory == request.Factory) + .LeftJoin((x, place) => x.PlaceCode == place.Code) .WhereIF(request.PlaceCode.HasValue, x => request.PlaceCode == x.PlaceCode) - .WhereIF(!request.Search.IsEmpty(),x => x.Name.Contains(request.Search)) - .Select((x,place) => new GetMenuResponse + .WhereIF(!request.Search.IsEmpty(), x => x.Name.Contains(request.Search)) + .Select((x, place) => new GetMenuResponse { - ShiftTypesSrt = x.ShiftTypes.ToString(), PlaceName = place.Name, - },true) + + }, true) .ToPageListAsync(request); return page; } @@ -44,50 +44,12 @@ namespace Dlhis.Canteen.Order.Services.Implements .FirstAsync(x => x.Code == request.PlaceCode); place.ThrowIfNull($"{request.PlaceCode}:该营业点不存在！"); - if (!request.Id.HasValue) - { - var entity = request.Adapt(); - entity.Code = Guid.NewGuid(); - await _dbContext.InsertAsync(entity); - } - else - { - var entity = await _dbContext.Queryable() - .Where(x => x.Id == request.Id).FirstAsync(); - request.Adapt(entity); - await _dbContext.UpdateAsync(entity); - } + } public async Task> GetDishesAsync(GetDishesRequest request) { - if (!request.MenuCode.HasValue) - { - return await _dbContext.Queryable() - .Select() - .ToPageListAsync(request); - } - else - { - var relas = await _dbContext.Queryable() - .Where(x => x.MenuCode == request.MenuCode) - .ToListAsync(); - - 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; - } + return null; } public async Task SaveDishesAsync(SaveDishesRequest request) @@ -95,33 +57,18 @@ namespace Dlhis.Canteen.Order.Services.Implements if (!request.Id.HasValue) { var dishers = request.Adapt(); - dishers.Code = Guid.NewGuid(); + //todo 检验重复 + dishers.CustomCode = request.CustomCode; await _dbContext.InsertAsync(dishers); } else { var entity = await _dbContext.Queryable() .Where(x => x.Id == request.Id).FirstAsync(); + request.Adapt(entity); await _dbContext.UpdateAsync(entity); } } - - public async Task DispositionDishesAsync(DispositionDishesRequest request) - { - var lst = new List(); - - foreach (var dto in request.DishersDtos) - { - var entity = new CanteenMenuDishersRelationshipEntity - { - MenuCode = request.MenudCode, - DishersCode = dto.DisherCode, - RestrictedNum = dto.RestrictedNum, - }; - lst.Add(entity); - } - await _dbContext.InsertAsync(lst); - } } } diff --git a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs index 7865befd..414e6381 100644 --- a/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs +++ b/Src/Dlhis.Canteen/Order/Services/Implements/MiniProgramOrderDetailService.cs @@ -27,17 +27,18 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService public async Task> GetMiniProgramOrderAsync(GetMiniProgramOrderRequest request) { var page = await _dbContext.Queryable() - .LeftJoin((order,place) => order.PlaceCode == place.Code) - .LeftJoin((order, place,dishers) => order.DishesCode == dishers.Code) - .LeftJoin((order, place, dishers,depart) => order.DepartmentNo == depart.No) + .LeftJoin((order, place) => order.PlaceCode == place.Code) + .LeftJoin((order, place, dishers) => order.DishesCode == dishers.CustomCode) + .LeftJoin((order, place, dishers, depart) => order.DepartmentNo == depart.No) .WhereIF(!request.Search.IsEmpty(), order => order.Name == request.Search || order.Code == request.Search) - .OrderBy(order => order.CostDate,SqlSugar.OrderByType.Desc) + .WhereIF(request.SysDate.HasValue, order => order.SysDate == request.SysDate) + .OrderBy(order => order.CostDate, OrderByType.Desc) .Select((order, place, dishers, depart) => new GetMiniProgramOrderResponse { PlaceName = place.Name, DepartmentName = depart.Name, DishesName = dishers.Name, - },true) + }, true) .ToPageListAsync(request); return page; } @@ -61,8 +62,8 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService public async Task> GetDetailAsync(GetDetailRequest request) { - var page = await _dbContext.Queryable() - .WhereIF(!request.Search.IsEmpty(),x => x.ThirdNo == request.Search) + var page = await _dbContext.Queryable() + .WhereIF(!request.Search.IsEmpty(), x => x.ThirdNo == request.Search) .Select() .ToPageListAsync(request); @@ -79,7 +80,7 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService true.ThrowIfTrue("20:30之后无法订餐!"); } //判断营业日 - var dishes = await _dbContext.Queryable().Where(x => x.Code == request.DishesCode).FirstAsync(); + var dishes = await _dbContext.Queryable().Where(x => x.CustomCode == request.DishesCode).FirstAsync(); dishes.Enable.ThrowIfFalse($"{dishes.Name}没启用!"); var menu = await _dbContext.Queryable().Where(x => x.Code == request.MenuCode).FirstAsync(); @@ -92,7 +93,7 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService true.ThrowIfTrue($"菜品:{dishes.Name}对应的菜单:{menu.Name}不在营业日!"); } - var restricted= await _dbContext.Queryable< CanteenMenuDishersRelationshipEntity>() + var restricted = await _dbContext.Queryable() .Where(x => x.MenuCode == request.MenuCode && x.DishersCode == request.DishesCode).FirstAsync(); restricted.ThrowIfNull($"每日菜单:{menu.Name} 还没有配置菜品:{dishes.Name} 的限售数量!"); if (restricted.RestrictedNum < 0) @@ -112,17 +113,17 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService flag.ThrowIfTrue($"工号:{request.UserCode} 姓名:{gainfo.Name} 已经定过{tomorrow}的{request.ShiftType.GetDescription()}!"); //支付方式 - 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(); - if (!codes.Contains(gainfo.Factory)) - { - if (request.PayType == CanteenPayEnumType.Repair) - { - true.ThrowIfTrue($"非山西，支付方式不能为{request.PayType.GetDescription()}"); - } - } + /* 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(); + if (!codes.Contains(gainfo.Factory)) + { + if (request.PayType == CanteenPayEnumType.Repair) + { + true.ThrowIfTrue($"非山西，支付方式不能为{request.PayType.GetDescription()}"); + } + }*/ //生成订单 var order = new MiniProgramOrderEntity @@ -150,24 +151,25 @@ public class MiniProgramOrderDetailService : IMiniProgramOrderDetailService { ThirdNo = order.No, SysDate = tomorrow, - ShiftType= request.ShiftType, - DishesCode= request.DishesCode, + ShiftType = request.ShiftType, + DishesCode = request.DishesCode, DishesName = dishes.Name, - Price = dishes.Amount, + Price = dishes.Price, Unit = dishes.Unit, - Num = request.DishesNum, - Amount = request.DishesNum * dishes.Amount, - OrderStatus = OrderDetailsStatusEnumType.I, + Number = request.DishesNum, + Amount = request.DishesNum * dishes.Price, + Status = OrderDetailsStatusEnumType.I, }; - order.TotalAmount = detail.Amount; + order.Amount = detail.Amount; await _dbContext.InsertAsync(order); await _dbContext.InsertAsync(detail); + //扣减份数 - var effect = await _dbContext.Updateable() - .SetColumns(x => x.RestrictedNum == restricted.RestrictedNum - request.DishesNum) - .SetColumns(x => x.Version == x.Version + 1) - .Where(x => x.MenuCode == request.MenuCode && x.DishersCode == request.DishesCode && x.Version == restricted.Version) - .ExecuteCommandAsync(); + var effect = await _dbContext.Updateable() + .SetColumns(x => x.RestrictedNum == restricted.RestrictedNum - request.DishesNum) + .SetColumns(x => x.Version == x.Version + 1) + .Where(x => x.MenuCode == request.MenuCode && x.DishersCode == request.DishesCode && x.Version == restricted.Version) + .ExecuteCommandAsync(); if (effect <= 0) throw new VersionExceptions("更新版本冲突"); } diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs index f313f008..b28482aa 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs @@ -1,83 +1,76 @@ -using Dlhis.Entity.Canteen.Enums; -using Kurisu.Core.DataAccess.Entity; +using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; +using Mapster; using SqlSugar; -using SqlSugar.DbConvert; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Dlhis.Entity.Canteen.Entities +namespace Dlhis.Entity.Canteen.Entities; + +/// +/// 菜品表 +/// +[SugarTable(TableName = "CanteenDishes", TableDescription = "菜品表")] +public class CanteenDishesEntity : SugarBaseEntity, ITenantId { /// - /// 菜品表 + /// 大类 /// - [SugarTable(TableName = "CanteenDishes", TableDescription = "菜品表")] - public class CanteenDishesEntity : SugarBaseEntity, ITenantId - { + [SugarColumn(ColumnDescription = "父类")] + public string PCategory { get; set; } - /// - /// 大类 - /// - [SugarColumn(ColumnDescription = "大类")] - public string Categories { get; set; } + /// + /// 小类 + /// + [SugarColumn(ColumnDescription = "分类", IsNullable = false)] + public string Category { get; set; } - /// - /// 小类 - /// - [SugarColumn(ColumnDescription = "小类")] - public string SubCategories { get; set; } + /// + /// 营业点 + /// + public Guid BusinessPlaceCode { get; set; } - /// - /// 菜品编码 - /// - [SugarColumn(ColumnDescription = "菜品编码")] - public Guid Code { get; set; } + /// + /// 菜品编码 + /// + [AdaptIgnore(MemberSide.Destination)] + [SugarColumn(ColumnDescription = "菜品编码", IsNullable = false)] + public string CustomCode { get; set; } - /// - /// 菜品名称 - /// - [SugarColumn(ColumnDescription = "菜品名称")] - public string Name { get; set; } + /// + /// 菜品名称 + /// + [SugarColumn(ColumnDescription = "菜品名称", IsNullable = false)] + public string Name { get; set; } - /// - /// 类型 - /// - [SugarColumn(ColumnDescription = "类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] - public CanteenDishesEnumType Type { get; set; } + ///// + ///// 类型 + ///// + //[SugarColumn(ColumnDescription = "类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] + //public CanteenDishesEnumType Type { get; set; } - /// - /// 描述 - /// - [SugarColumn(ColumnDescription = "描述")] - public string Description { get; set; } + /// + /// 描述 + /// + [SugarColumn(ColumnDescription = "描述")] + public string Description { get; set; } - /// - /// 单价 - /// - [SugarColumn(ColumnDescription = "单价")] - public decimal Amount { get; set; } + /// + /// 单价 + /// + [SugarColumn(ColumnDescription = "单价")] + public decimal Price { get; set; } - /// - /// 单位 - /// - [SugarColumn(ColumnDescription = "单位")] - public string Unit { get; set; } + /// + /// 图片 + /// + [SugarColumn(ColumnDescription = "图片")] + public string ImageUrl { get; set; } - /// - /// 图片 - /// - [SugarColumn(ColumnDescription = "图片")] - public string Image { get; set; } + /// + /// 是否启用 + /// + [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")] + public bool Enable { get; set; } - /// - /// 是否启用 - /// - [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")] - public bool Enable { get; set; } - public string TenantId { get; set; } - } + public string TenantId { get; set; } } diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuDishersRelationshipEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuDishersRelationshipEntity.cs deleted file mode 100644 index da94aa3b..00000000 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuDishersRelationshipEntity.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Kurisu.SqlSugar; -using SqlSugar; - -namespace Dlhis.Entity.Canteen.Entities -{ - /// - /// 菜单菜品表 - /// - [SugarTable(TableName = "CanteenMenuDishersRelationship", TableDescription = "菜单菜品表")] - public class CanteenMenuDishersRelationshipEntity : SugarBaseEntity - { - /// - /// 菜单code - /// - public Guid MenuCode { get; set; } - - /// - /// 菜品code - /// - public Guid DishersCode { get; set; } - - /// - /// 限售份数 - /// - public int RestrictedNum { get; set; } - - /// - /// 版本 - /// - public int Version { get; set; } - } -} diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs index 77b12057..e9168b4b 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/CanteenMenuEntity.cs @@ -2,6 +2,7 @@ using Kurisu.Core.DataAccess.Entity; using Kurisu.SqlSugar; using SqlSugar; +using SqlSugar.DbConvert; namespace Dlhis.Entity.Canteen.Entities; @@ -9,52 +10,63 @@ namespace Dlhis.Entity.Canteen.Entities; /// 菜单表 /// [SugarTable(TableName = "CanteenMenu", TableDescription = "菜单表")] -public class CanteenMenuEntity : SugarBaseEntity, ITenantId +public class CanteenMenuEntity : SugarBaseEntity, ITenantId, IVersion { - - /// - /// 菜单编码 - /// - [SugarColumn(ColumnDescription = "菜单编码")] - public Guid Code { get; set; } - /// /// 菜单名称 /// [SugarColumn(ColumnDescription = "菜单名称")] public string Name { get; set; } + /// + /// 菜单类型 + /// + [SugarColumn(SqlParameterDbType = typeof(EnumToStringConvert))] + public CanteenMenuEnumType Type { get; set; } + /// /// 所属营业点 /// [SugarColumn(ColumnDescription = "所属营业点")] public Guid PlaceCode { get; set; } - /// - /// 厂区 - /// - [SugarColumn(ColumnDescription = "厂区")] - public string Factory { get; set; } - /// /// 营业日期 /// - [SugarColumn(ColumnDescription = "营业日期")] - public DateOnly StartDate { get; set; } + [SugarColumn(ColumnDataType = "date", ColumnDescription = "营业日期")] + public DateTime Date { get; set; } /// - /// 餐次段 + /// 餐次 /// - [SugarColumn(ColumnDataType = "varchar(150)", IsJson = true, ColumnDescription = "餐次段", DefaultValue = "[]")] - public List ShiftTypes { get; set; } + [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "餐次")] + public ShiftEnumType ShiftType { get; set; } + + + /// + /// 菜品编码 + /// + public string DishesCode { get; set; } + + /// + /// 剩余数量 + /// + public int Number { get; set; } /// /// 是否启用 /// [SugarColumn(ColumnDataType = "bit", ColumnDescription = "是否启用")] public bool Enable { get; set; } + + public string TenantId { get; set; } + + /// + /// 并发控制 + /// + public int Version { get; set; } } diff --git a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs index 91b3b525..4dff6803 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/MiniProgramOrderEntity.cs @@ -72,12 +72,6 @@ namespace Dlhis.Entity.Canteen.Entities [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "餐次")] public ShiftEnumType ShiftType { get; set; } - /// - /// 菜品 - /// - [SugarColumn(ColumnDescription = "菜品")] - public Guid DishesCode { get; set; } - /// /// 手机号码 /// @@ -88,19 +82,13 @@ namespace Dlhis.Entity.Canteen.Entities /// 用餐日期 /// [SugarColumn(ColumnDescription = "用餐日期")] - public DateOnly SysDate { get; set; } - - /// - /// 下单时间 - /// - [SugarColumn(ColumnDescription = "下单时间")] - public DateTime CostDate { get; set; } + public DateTime UseDate { get; set; } /// /// 支付方式 /// [SugarColumn(ColumnDescription = "支付方式", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))] - public CanteenPayEnumType PayType { get; set; } + public BalanceRecordSourceEnumType PayType { get; set; } /// /// 订单状态 @@ -112,13 +100,14 @@ namespace Dlhis.Entity.Canteen.Entities /// 订单类型 /// [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单类型")] - public CanteenDishesEnumType OrderType { get; set; } + public CanteenMenuEnumType OrderType { get; set; } /// /// 总金额 /// - [SugarColumn(ColumnDescription = "总金额")] - public decimal TotalAmount { get; set; } + [SugarColumn(ColumnDescription = "金额")] + public decimal Amount { 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 518305cb..2f692ab9 100644 --- a/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs +++ b/Src/Dlhis.Entity/Canteen/Entities/OrderDetailsEntity.cs @@ -4,74 +4,50 @@ using Kurisu.SqlSugar; using SqlSugar; using SqlSugar.DbConvert; -namespace Dlhis.Entity.Canteen.Entities +namespace Dlhis.Entity.Canteen.Entities; + +/// +/// 订餐明细表 +/// +[SugarTable(TableName = "OrderDetails", TableDescription = "订餐明细表")] +public class OrderDetailsEntity : SugarBaseEntity, ITenantId { /// - /// 订餐明细表 + /// 订单号 /// - [SugarTable(TableName = "OrderDetails", TableDescription = "订餐明细表")] - public class OrderDetailsEntity : SugarBaseEntity, ITenantId - { - /// - /// 订单号 - /// - [SugarColumn(ColumnDescription = "订单号")] - public string ThirdNo { get; set; } + [SugarColumn(ColumnDescription = "订单号")] + public string OrderNo { get; set; } - /// - /// 营业日(用餐日期) - /// - [SugarColumn(ColumnDescription = "营业日")] - public DateOnly SysDate { get; set; } + /// + /// 菜品编码 + /// + [SugarColumn(ColumnDescription = "菜品编码")] + public string DishesCode { get; set; } - /// - /// 餐次 - /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "餐次")] - public ShiftEnumType ShiftType { get; set; } + /// + /// 单价 + /// + [SugarColumn(ColumnDescription = "单价")] + public decimal Price { get; set; } - /// - /// 菜品编码 - /// - [SugarColumn(ColumnDescription = "菜品编码")] - public Guid DishesCode { get; set; } + /// + /// 数量 + /// + [SugarColumn(ColumnDescription = "数量")] + public int Number { get; set; } - /// - /// 菜品名称 - /// - [SugarColumn(ColumnDescription = "菜品名称")] - public string DishesName { get; set; } + /// + /// 单位 + /// + [SugarColumn(ColumnDescription = "单位")] + public string Unit { get; set; } - /// - /// 单价 - /// - [SugarColumn(ColumnDescription = "单价")] - public decimal Price { get; set; } - /// - /// 单位 - /// - [SugarColumn(ColumnDescription = "单位")] - public string Unit { get; set; } + /// + /// 订单明细状态 + /// + [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单明细状态")] + public OrderDetailsStatusEnumType Status { get; set; } - /// - /// 数量 - /// - [SugarColumn(ColumnDescription = "数量")] - public int Num { get; set; } - - /// - /// 金额 - /// - [SugarColumn(ColumnDescription = "金额")] - public decimal Amount { get; set; } - - /// - /// 订单明细状态 - /// - [SugarColumn(ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert), ColumnDescription = "订单明细状态")] - public OrderDetailsStatusEnumType OrderStatus { get; set; } - - public string TenantId { get; set; } - } + public string TenantId { get; set; } } diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenDishesEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenDishesEnumType.cs deleted file mode 100644 index dc3ba103..00000000 --- a/Src/Dlhis.Entity/Canteen/Enums/CanteenDishesEnumType.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Dlhis.Entity.Canteen.Enums -{ - /// - /// 菜品类型 - /// - [Description("菜品类型")] - public enum CanteenDishesEnumType - { - - /// - /// 订餐 - /// - [Description("订餐")] - Order = 1, - - /// - /// 扫码点餐 - /// - [Description("扫码点餐")] - QrCode=2, - - /// - /// 通用 - /// - [Description("通用")] - General = 3, - } -} diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenMenuEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenMenuEnumType.cs new file mode 100644 index 00000000..bdf956a9 --- /dev/null +++ b/Src/Dlhis.Entity/Canteen/Enums/CanteenMenuEnumType.cs @@ -0,0 +1,28 @@ +using System.ComponentModel; + +namespace Dlhis.Entity.Canteen.Enums; + +/// +/// 菜品类型 CanteenMenuEnumType +/// +[Description("菜品类型")] +public enum CanteenMenuEnumType +{ + /// + /// 订餐 + /// + [Description("订餐")] + Order = 1, + + /// + /// 扫码点餐 + /// + [Description("扫码点餐")] + QrCode=2, + + /// + /// 通用 + /// + [Description("通用")] + General = 3, +} diff --git a/Src/Dlhis.Entity/Canteen/Enums/CanteenPayEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/CanteenPayEnumType.cs deleted file mode 100644 index 72218726..00000000 --- a/Src/Dlhis.Entity/Canteen/Enums/CanteenPayEnumType.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Dlhis.Entity.Canteen.Enums -{ - /// - /// 支付方式 - /// - [Description("支付方式")] - public enum CanteenPayEnumType - { - /// - /// 餐补 - /// - [Description("餐补")] - Repair = 1, - - /// - /// 现场 - /// - [Description("现场")] - Scene = 2, - } -}