From 19078a0680921c0e299d6c20ded047df1b3ba6a6 Mon Sep 17 00:00:00 2001
From: zhaoy <137053305@qq.com>
Date: Thu, 18 Jan 2024 17:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E8=B0=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../BPA.SAAS.KitChenManage.Application.csproj | 4 -
.../BPA.SAAS.KitChenManage.Application.xml | 147 ++++++++++++++++--
.../Food/Dtos/FoodMenuBaseDto.cs | 22 +++
.../Food/Dtos/FoodMenuDtoInput.cs | 15 ++
.../Food/Dtos/FoodMenuDtoPageInput.cs | 15 ++
.../Food/FoodMenuServices.cs | 85 ++++++++++
.../Food/Services/FoodMenuService.cs | 131 ++++++++++++++++
.../Food/Services/IFoodMenuService.cs | 52 +++++++
.../Store/Dtos/StoreDtoPageInput.cs | 2 +-
.../Store/Services/StoreService.cs | 2 +-
.../System/Dtos/Mapper.cs | 9 --
.../System/Services/ISystemService.cs | 7 -
.../System/Services/SystemService.cs | 10 --
.../System/SystemAppService.cs | 23 ---
.../BPA.SAAS.KitChenManage.Core.xml | 10 ++
.../Model/BPA_FoodMenu.cs | 18 +++
.../Model/BPA_FoodMenuGoods.cs | 24 +++
17 files changed, 510 insertions(+), 66 deletions(-)
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuBaseDto.cs
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoInput.cs
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoPageInput.cs
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs
create mode 100644 BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs
delete mode 100644 BPA.SAAS.KitChenManage.Application/System/Dtos/Mapper.cs
delete mode 100644 BPA.SAAS.KitChenManage.Application/System/Services/ISystemService.cs
delete mode 100644 BPA.SAAS.KitChenManage.Application/System/Services/SystemService.cs
delete mode 100644 BPA.SAAS.KitChenManage.Application/System/SystemAppService.cs
create mode 100644 BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenu.cs
create mode 100644 BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenuGoods.cs
diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj
index dbb6614..70e45f7 100644
--- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj
+++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.csproj
@@ -18,8 +18,4 @@
-
-
-
-
diff --git a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml
index 9b1515c..e3ed43a 100644
--- a/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml
+++ b/BPA.SAAS.KitChenManage.Application/BPA.SAAS.KitChenManage.Application.xml
@@ -4,6 +4,142 @@
BPA.SAAS.KitChenManage.Application
+
+
+ 商品菜品id
+
+
+
+
+ 菜谱信息表
+
+
+
+
+ 分页查询
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+ 菜谱关联商品
+
+
+
+
+
+
+ 查询菜谱绑定的商品
+
+
+
+
+
+
+ 分页
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+ 菜谱关联商品
+
+
+
+
+
+
+ 查询菜谱绑定的商品
+
+
+
+
+
+
+ 分页
+
+
+
+
+
+
+ 添加
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+ 删除
+
+
+
+
+
+
+ 菜谱关联商品
+
+
+
+
+
+
+ 查询菜谱绑定的商品
+
+
+
+
分页
@@ -88,16 +224,5 @@
-
-
- 系统服务接口
-
-
-
-
- 获取系统描述
-
-
-
diff --git a/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuBaseDto.cs b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuBaseDto.cs
new file mode 100644
index 0000000..1efedce
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuBaseDto.cs
@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food.Dtos
+{
+ public class FoodMenuBaseDto
+ {
+ ///
+ /// 商品菜品id
+ ///
+ public List GoodsIds { get; set; }
+
+ ///
+ /// 菜谱信息表
+ ///
+ public string FoodMenuId { get; set; }
+ }
+
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoInput.cs b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoInput.cs
new file mode 100644
index 0000000..774d49c
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoInput.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food.Dtos
+{
+ public class FoodMenuDtoInput
+ {
+ public string Id { get; set; }
+ public string Name { get; set; }
+ public string Code { get; set; }
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoPageInput.cs b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoPageInput.cs
new file mode 100644
index 0000000..5910e01
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/Dtos/FoodMenuDtoPageInput.cs
@@ -0,0 +1,15 @@
+using BPA.SAAS.KitChenManage.Core.Base;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food.Dtos
+{
+ public class FoodMenuDtoPageInput: PageInputBase
+ {
+ public string Name { get; set; }
+ public string Code { get; set; }
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs b/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs
new file mode 100644
index 0000000..24ee7ed
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/FoodMenuServices.cs
@@ -0,0 +1,85 @@
+using BPA.SAAS.KitChenManage.Application.Food.Dtos;
+using BPA.SAAS.KitChenManage.Application.Food.Services;
+using BPA.SAAS.KitChenManage.Application.Store.Dtos;
+using BPA.SAAS.KitChenManage.Application.Store.Services;
+using BPA.SAAS.KitChenManage.Core.Base;
+using BPA.SAAS.KitChenManage.Core.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food
+{
+ [ApiDescriptionSettings("FoodMenu", Tag = "场景菜谱管理")]
+ public class FoodMenuServices : IDynamicApiController
+ {
+ IFoodMenuService _foodmenuService;
+ public FoodMenuServices(IFoodMenuService foodmenuService)
+ {
+ _foodmenuService = foodmenuService;
+ }
+ ///
+ /// 分页查询
+ ///
+ ///
+ ///
+ [HttpPost("/api/foodmenu/page")]
+
+ public async Task Page(FoodMenuDtoPageInput input)
+ {
+ return await _foodmenuService.Page(input);
+ }
+ ///
+ /// 添加
+ ///
+ ///
+ ///
+ [HttpPost("/api/foodmenu/add")]
+ public async Task Add(FoodMenuDtoInput input)
+ {
+ return await _foodmenuService.Add(input);
+ }
+ ///
+ /// 修改
+ ///
+ ///
+ ///
+ [HttpPost("/api/foodmenu/update")]
+ public async Task Update(FoodMenuDtoInput input)
+ {
+ return await _foodmenuService.Update(input);
+ }
+ ///
+ /// 删除
+ ///
+ ///
+ ///
+ [HttpPost("/api/foodmenu/delete")]
+ public async Task Delete(List input)
+ {
+ return await _foodmenuService.Delete(input);
+ }
+ ///
+ /// 菜谱关联商品
+ ///
+ ///
+ ///
+ [HttpPost("/api/foodmenu/editfoodmenugoods")]
+ public async Task EditFoodMenuGoods(FoodMenuBaseDto inputDto)
+ {
+ return await _foodmenuService.EditFoodMenuGoods(inputDto);
+ }
+ ///
+ /// 查询菜谱绑定的商品
+ ///
+ ///
+ ///
+ [HttpGet("/api/foodmenu/getfoodmenugoods")]
+ public async Task> GetFoodMenuGoods(string foodMenuId)
+ {
+ return await _foodmenuService.GetFoodMenuGoods(foodMenuId);
+ }
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs b/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs
new file mode 100644
index 0000000..085ed3a
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/Services/FoodMenuService.cs
@@ -0,0 +1,131 @@
+using BPA.SAAS.KitChenManage.Application.Food.Dtos;
+using BPA.SAAS.KitChenManage.Application.Store.Dtos;
+using BPA.SAAS.KitChenManage.Application.Store.Services;
+using BPA.SAAS.KitChenManage.Core.Base;
+using BPA.SAAS.KitChenManage.Core.Model;
+using Furion.LinqBuilder;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food.Services
+{
+ public class FoodMenuService : IFoodMenuService, ITransient
+ {
+ private readonly ISqlSugarClient _db;
+ public FoodMenuService(ISqlSugarClient db)
+ {
+ _db=db;
+ }
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ public async Task Page(FoodMenuDtoPageInput input)
+ {
+ RefAsync total = 0;
+ var res = await _db.Queryable()
+ .WhereIF(!input.Code.IsNullOrEmpty(), t => t.Code.Contains(input.Code))
+ .WhereIF(!input.Name.IsNullOrEmpty(), t => t.Name.Contains(input.Name))
+
+ .Select(t => new
+ {
+ CreateAt = t.CreateAt,
+ Id = t.Id,
+ Name = t.Name,
+ Code = t.Code,
+
+ }).OrderBy(x => x.CreateAt, OrderByType.Desc).ToPageListAsync(input.Current, input.PageSize, total);
+ PageUtil util = new PageUtil()
+ {
+ Total = total,
+ Data = res
+
+ };
+ return util;
+ }
+ ///
+ /// 添加
+ ///
+ ///
+ ///
+ public async Task Add(FoodMenuDtoInput input)
+ {
+ var Store = input.Adapt();
+ // role.DataScopeType = DataScopeType.ALL;
+ return await _db.Insertable(Store).CallEntityMethod(t => t.Create()).ExecuteCommandAsync() > 0;
+ }
+ ///
+ /// 修改
+ ///
+ ///
+ ///
+ public async Task Update(FoodMenuDtoInput input)
+ {
+ var BPA_Food = await _db.Queryable().Where(a => a.Id == input.Id).FirstAsync();
+
+ var Store = await _db.Queryable().Where(a => a.Id == input.Id).FirstAsync();
+ Store.Name = input.Name;
+ Store.Code = input.Code;
+
+ return _db.Updateable(Store).ExecuteCommandHasChange();
+
+ }
+ ///
+ /// 删除
+ ///
+ ///
+ ///
+ public async Task Delete(List input)
+ {
+ try
+ {
+ // 查询数据库中是否存在未删除的活动信息
+ var resEntitites = _db.Queryable().In(input).ToList();
+ var res = await _db.Deleteable(resEntitites).ExecuteCommandAsync();
+ return res > 0;
+
+ }
+ catch (Exception)
+ {
+ throw Oops.Oh("删除失败");
+ }
+ }
+ ///
+ /// 菜谱关联商品
+ ///
+ ///
+ ///
+ public async Task EditFoodMenuGoods(FoodMenuBaseDto inputDto)
+ {
+ //删除设置的菜谱
+ await _db.Deleteable()
+ .Where(x => inputDto.FoodMenuId.Contains(x.FoodMenuId)).ExecuteCommandAsync();
+ //菜谱添加商品
+ var data = inputDto.GoodsIds.Select(x => new BPA_FoodMenuGoods()
+ {
+ FoodMenuId = inputDto.FoodMenuId,
+
+ GoodsId = x,
+ }).ToList();
+ if (data.Count > 0)
+ {
+ var res = await _db.Insertable(data).CallEntityMethod(m => m.Create()).ExecuteCommandAsync();
+ }
+ return true;
+
+ }
+ ///
+ /// 查询菜谱绑定的商品
+ ///
+ ///
+ ///
+ public async Task> GetFoodMenuGoods(string foodMenuId)
+ {
+ return await _db.Queryable().Where(x => x.FoodMenuId == foodMenuId).ToListAsync();
+ }
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs b/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs
new file mode 100644
index 0000000..b04c7b7
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Application/Food/Services/IFoodMenuService.cs
@@ -0,0 +1,52 @@
+using BPA.SAAS.KitChenManage.Application.Food.Dtos;
+using BPA.SAAS.KitChenManage.Application.Store.Dtos;
+using BPA.SAAS.KitChenManage.Core.Base;
+using BPA.SAAS.KitChenManage.Core.Model;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Application.Food.Services
+{
+ public interface IFoodMenuService
+ {
+ ///
+ /// 分页
+ ///
+ ///
+ ///
+ Task Page(FoodMenuDtoPageInput input);
+ ///
+ /// 添加
+ ///
+ ///
+ ///
+ Task Add(FoodMenuDtoInput input);
+ ///
+ /// 修改
+ ///
+ ///
+ ///
+ Task Update(FoodMenuDtoInput input);
+ ///
+ /// 删除
+ ///
+ ///
+ ///
+ Task Delete(List input);
+ ///
+ /// 菜谱关联商品
+ ///
+ ///
+ ///
+ Task EditFoodMenuGoods(FoodMenuBaseDto inputDto);
+ ///
+ /// 查询菜谱绑定的商品
+ ///
+ ///
+ ///
+ Task> GetFoodMenuGoods(string foodMenuId);
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Application/Store/Dtos/StoreDtoPageInput.cs b/BPA.SAAS.KitChenManage.Application/Store/Dtos/StoreDtoPageInput.cs
index f9fcdad..8026fb5 100644
--- a/BPA.SAAS.KitChenManage.Application/Store/Dtos/StoreDtoPageInput.cs
+++ b/BPA.SAAS.KitChenManage.Application/Store/Dtos/StoreDtoPageInput.cs
@@ -10,7 +10,7 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Dtos
public class StoreDtoPageInput: PageInputBase
{
public string Name { get; set; }
- public string OrgId { get; set; }
+ public string OrgName { get; set; }
public string Phone { get; set; }
}
}
diff --git a/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs b/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs
index c76ad5f..3edd476 100644
--- a/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs
+++ b/BPA.SAAS.KitChenManage.Application/Store/Services/StoreService.cs
@@ -26,7 +26,7 @@ namespace BPA.SAAS.KitChenManage.Application.Store.Services
{
RefAsync total = 0;
var res = await _db.Queryable()
- .WhereIF(!input.OrgId.IsNullOrEmpty(), t => t.OrgId.Contains(input.OrgId))
+ .WhereIF(!input.OrgName.IsNullOrEmpty(), t => t.OrgId.Contains(input.OrgName))
.WhereIF(!input.Name.IsNullOrEmpty(), t => t.Name.Contains(input.Name))
.Select(t => new StoreDtoOutput
diff --git a/BPA.SAAS.KitChenManage.Application/System/Dtos/Mapper.cs b/BPA.SAAS.KitChenManage.Application/System/Dtos/Mapper.cs
deleted file mode 100644
index 4ec4ba8..0000000
--- a/BPA.SAAS.KitChenManage.Application/System/Dtos/Mapper.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace BPA.SAAS.KitChenManage.Application
-{
- public class Mapper : IRegister
- {
- public void Register(TypeAdapterConfig config)
- {
- }
- }
-}
\ No newline at end of file
diff --git a/BPA.SAAS.KitChenManage.Application/System/Services/ISystemService.cs b/BPA.SAAS.KitChenManage.Application/System/Services/ISystemService.cs
deleted file mode 100644
index 8377952..0000000
--- a/BPA.SAAS.KitChenManage.Application/System/Services/ISystemService.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace BPA.SAAS.KitChenManage.Application
-{
- public interface ISystemService
- {
- string GetDescription();
- }
-}
\ No newline at end of file
diff --git a/BPA.SAAS.KitChenManage.Application/System/Services/SystemService.cs b/BPA.SAAS.KitChenManage.Application/System/Services/SystemService.cs
deleted file mode 100644
index 34dd316..0000000
--- a/BPA.SAAS.KitChenManage.Application/System/Services/SystemService.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace BPA.SAAS.KitChenManage.Application
-{
- public class SystemService : ISystemService, ITransient
- {
- public string GetDescription()
- {
- return "让 .NET 开发更简单，更通用，更流行。";
- }
- }
-}
\ No newline at end of file
diff --git a/BPA.SAAS.KitChenManage.Application/System/SystemAppService.cs b/BPA.SAAS.KitChenManage.Application/System/SystemAppService.cs
deleted file mode 100644
index 8578ff2..0000000
--- a/BPA.SAAS.KitChenManage.Application/System/SystemAppService.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace BPA.SAAS.KitChenManage.Application
-{
- ///
- /// 系统服务接口
- ///
- public class SystemAppService : IDynamicApiController
- {
- private readonly ISystemService _systemService;
- public SystemAppService(ISystemService systemService)
- {
- _systemService = systemService;
- }
-
- ///
- /// 获取系统描述
- ///
- ///
- public string GetDescription()
- {
- return _systemService.GetDescription();
- }
- }
-}
\ No newline at end of file
diff --git a/BPA.SAAS.KitChenManage.Core/BPA.SAAS.KitChenManage.Core.xml b/BPA.SAAS.KitChenManage.Core/BPA.SAAS.KitChenManage.Core.xml
index 5cc252c..8c9126f 100644
--- a/BPA.SAAS.KitChenManage.Core/BPA.SAAS.KitChenManage.Core.xml
+++ b/BPA.SAAS.KitChenManage.Core/BPA.SAAS.KitChenManage.Core.xml
@@ -60,5 +60,15 @@
+
+
+ 菜谱id
+
+
+
+
+ 商品id
+
+
diff --git a/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenu.cs b/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenu.cs
new file mode 100644
index 0000000..957fa6d
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenu.cs
@@ -0,0 +1,18 @@
+using BPA.SAAS.KitChenManage.Core.Base;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Core.Model
+{
+ [SugarTable("bpa_foodmenu")]
+ public class BPA_FoodMenu : IBaseEntity, IGroupId
+ {
+ public string Name { get; set; }
+ public string Code { get; set; }
+ public string GroupId { get; set; }
+ }
+}
diff --git a/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenuGoods.cs b/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenuGoods.cs
new file mode 100644
index 0000000..b83234b
--- /dev/null
+++ b/BPA.SAAS.KitChenManage.Core/Model/BPA_FoodMenuGoods.cs
@@ -0,0 +1,24 @@
+using BPA.SAAS.KitChenManage.Core.Base;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPA.SAAS.KitChenManage.Core.Model
+{
+ [SugarTable("bpa_foodmenugoods")]
+ public class BPA_FoodMenuGoods : IBaseEntity, IGroupId
+ {
+ ///
+ /// 菜谱id
+ ///
+ public string FoodMenuId { get; set; }
+ ///
+ /// 商品id
+ ///
+ public string GoodsId { get; set; }
+ public string GroupId { get; set; }
+ }
+}