From 4fe71a435b5a7f09956556693c950733586ae042 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Thu, 10 Apr 2025 10:23:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E5=85=BB=E7=B1=BB=E5=88=AB=E7=AD=89?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../core/menu/domain/MenuNutrition.java | 1 +
.../core/menu/dto/MenuNutritionDTO.java | 2 ++
.../impl/MenuNutritionServiceImpl.java | 2 +-
.../impl/MenuNutritionTypeServiceImpl.java | 26 +++++++++++--------
.../mapper/menu/MenuNutritionTypeMapper.xml | 4 +++
5 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java
index 19e6924..c449be1 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuNutrition.java
@@ -63,6 +63,7 @@ public class MenuNutrition extends BaseEntity {
@ApiModelProperty(value = "类别id")
private Long categoryId;
+
/** 食材大类 */
@Excel(name = "食材大类")
@ApiModelProperty(value = "食材大类")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java
index 2ed6a38..1ed1f2b 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/dto/MenuNutritionDTO.java
@@ -33,6 +33,8 @@ public class MenuNutritionDTO {
private Integer price;
@ApiModelProperty("食材颜色")
private String color;
+ @ApiModelProperty("食材小类id")
+ private Long categoryId;
@ApiModelProperty("食材大类")
private @NotNull( message = "{menu_big_type_null}" ) String bigType;
@ApiModelProperty("食材小类")
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java
index 36d9609..3591b36 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionServiceImpl.java
@@ -104,7 +104,7 @@ public class MenuNutritionServiceImpl implements IMenuNutritionService {
return menuNutritionMapper.insertMenuNutrition(menuNutrition);
}
} catch (Exception e) {
- throw new ServiceException("错误信息描述");
+ throw new ServiceException(e.toString());
}
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionTypeServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionTypeServiceImpl.java
index ec08c41..958dae1 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionTypeServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuNutritionTypeServiceImpl.java
@@ -60,23 +60,27 @@ public class MenuNutritionTypeServiceImpl implements IMenuNutritionTypeService {
public int insertMenuNutritionType(MenuNutritionType menuNutritionType) {
menuNutritionType.setCreateBy(SecurityUtils.getUserId()+"");
MenuNutritionType one = menuNutritionTypeMapper.getOne(menuNutritionType);
+ try {
if(one !=null ){
throw new ServiceException("该营养基础类型已存在");
}
MenuNutritionType getParentOne = menuNutritionTypeMapper.getParentOne(menuNutritionType);
- if(getParentOne == null){
- throw new ServiceException("无效的父级节点");
- }else{
- if("2".equals(getParentOne.getLevel())){
- throw new ServiceException("不允许添加三级节点");
- }else{
- menuNutritionType.setLevel("2");
- }
- }
- try {
+ if(menuNutritionType.getParentId() == 0L){
return menuNutritionTypeMapper.insertMenuNutritionType(menuNutritionType);
+ }else{
+ if(getParentOne == null){
+ throw new ServiceException("无效的父级节点");
+ }else{
+ if("2".equals(getParentOne.getLevel())){
+ throw new ServiceException("不允许添加三级节点");
+ }else{
+ menuNutritionType.setLevel("2");
+ }
+ }
+ return menuNutritionTypeMapper.insertMenuNutritionType(menuNutritionType);
+ }
} catch (Exception e) {
- throw new ServiceException("错误信息描述");
+ throw new ServiceException(e.getMessage());
}
}
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionTypeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionTypeMapper.xml
index fec42b3..c99ec11 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionTypeMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuNutritionTypeMapper.xml
@@ -81,6 +81,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id}
+ or parent_id in
+
+ #{id}
+