From 0b00c7532a0330785d0c8cf46bcb05dfc63e65c4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 15:11:24 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 5 +++++
ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java | 3 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 7 ++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java | 2 +-
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
index a39cbf1..9c70ed1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -91,7 +91,7 @@
@GetMapping(value = "/getDetailById")
public AjaxResult<List<TFoundationPersonVO>> getDetailByMealType(@RequestParam("mealType") Integer mealType) {
// 查询基础设置
- List<TFoundationPersonVO> foundationPersonVOS = foundationPersonService.getSetList();
+ List<TFoundationPersonVO> foundationPersonVOS = foundationPersonService.getPersonList();
List<TFoundationPersonVO> collect = foundationPersonVOS.stream().filter(e -> Objects.equals(e.getMealType(), mealType)).collect(Collectors.toList());
for (TFoundationPersonVO foundationPersonVO : collect) {
List<TFoundationConfig> list = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
index 4c410e1..8e3a364 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
@@ -15,6 +15,7 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -65,6 +66,10 @@
TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
.eq(TShop::getMealType, mealType)
.last("LIMIT 1"));
+ if(Objects.isNull(one)){
+ String str = mealType == 1 ? "中餐" : "火锅";
+ return AjaxResult.error("无"+str+"类型店铺");
+ }
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(TGoodsType::getShopId, one.getId());
return AjaxResult.success(goodsTypeService.list(wrapper));
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
index 748723e..8429217 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TFoundationPersonService.java
@@ -49,4 +49,7 @@
List<TFoundationPersonVO> getSetList();
+ List<TFoundationPersonVO> getPersonList();
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
index 06e65f3..2cd37d8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
@@ -77,7 +77,7 @@
throw new ServiceException("菜品重复设置");
}
// 添加人数
- this.updateById(tFoundationPersonDTO);
+ this.saveOrUpdate(tFoundationPersonDTO);
// 删除菜品
foundationConfigService.remove(Wrappers.lambdaQuery(TFoundationConfig.class)
.eq(TFoundationConfig::getPersonId,tFoundationPersonDTO.getId()));
@@ -154,4 +154,9 @@
}
return list;
}
+
+ @Override
+ public List<TFoundationPersonVO> getPersonList() {
+ return this.baseMapper.getSetList();
+ }
}
--
Gitblit v1.7.1