From 76c5a660d2168e0e8248f7ebb1fca191823b00f2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 12 三月 2025 17:19:02 +0800
Subject: [PATCH] 修改人员
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
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 e19d6fe..4a859e7 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
@@ -5,8 +5,10 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.service.TokenService;
+import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TGoodsType;
import com.ruoyi.system.domain.TShop;
+import com.ruoyi.system.service.TFoundationConfigService;
import com.ruoyi.system.service.TGoodsTypeService;
import com.ruoyi.system.service.TShopService;
import io.swagger.annotations.Api;
@@ -33,12 +35,14 @@
private final TGoodsTypeService goodsTypeService;
private final TokenService tokenService;
private final TShopService shopService;
+ private final TFoundationConfigService foundationConfigService;
@Autowired
- public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService) {
+ public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService, TFoundationConfigService foundationConfigService) {
this.goodsTypeService = goodsTypeService;
this.tokenService = tokenService;
this.shopService = shopService;
+ this.foundationConfigService = foundationConfigService;
}
/**
@@ -62,7 +66,7 @@
*/
@ApiOperation( value = "查询商品分类列表-后台使用")
@GetMapping(value = "/getList")
- public AjaxResult<List<TGoodsType>> getList(@RequestParam("mealType") Integer mealType) {
+ public AjaxResult<List<TGoodsType>> getList(@RequestParam(value = "mealType",required = false) Integer mealType) {
// 获取餐饮分类店铺id
// TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
// .eq(TShop::getMealType, mealType)
@@ -71,9 +75,14 @@
// String str = mealType == 1 ? "中餐" : "火锅";
// return AjaxResult.error("无"+str+"类型店铺");
// }
+ if(Objects.isNull(mealType)){
+ mealType = 2;
+ }
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TGoodsType::getMealType, mealType);
- return AjaxResult.success(goodsTypeService.list());
+ if(Objects.nonNull(mealType)){
+ wrapper.eq(TGoodsType::getMealType, mealType);
+ }
+ return AjaxResult.success(goodsTypeService.list(wrapper));
}
/**
@@ -84,8 +93,8 @@
public AjaxResult<Boolean> add(@RequestBody TGoodsType dto) {
Long shopId = tokenService.getLoginUser().getObjectId();
TShop shop = shopService.getById(shopId);
- dto.setMealType(shop.getMealType());
- dto.setShopId(tokenService.getLoginUser().getObjectId());
+ dto.setMealType(Objects.nonNull(shop.getMealType()) ? shop.getMealType() : 1);
+ dto.setShopId(shopId);
return AjaxResult.success(goodsTypeService.save(dto));
}
@@ -113,6 +122,12 @@
@ApiOperation( value = "删除商品分类")
@DeleteMapping(value = "/deleteById")
public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
+ // 查询分类是否在生成配置里面存在
+ long count = foundationConfigService.count(Wrappers.lambdaQuery(TFoundationConfig.class)
+ .eq(TFoundationConfig::getTypeId, id));
+ if(count>0){
+ return AjaxResult.warn("该分类在基础设置中正在使用，无法删除");
+ }
return AjaxResult.success(goodsTypeService.removeById(id));
}
--
Gitblit v1.7.1