From cf7740957f2b859e541116f2f4603beff8a0c832 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 20 十二月 2024 17:19:38 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 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 8e3a364..dc9f2ea 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;
}
/**
@@ -49,9 +53,10 @@
public AjaxResult<List<TGoodsType>> list() {
Long shopId = tokenService.getLoginUser().getObjectId();
Integer roleType = tokenService.getLoginUser().getRoleType();
+ TShop shop = shopService.getById(shopId);
LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
if(roleType != 1){
- wrapper.eq(TGoodsType::getShopId, shopId);
+ wrapper.eq(TGoodsType::getMealType, shop.getMealType());
}
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -61,17 +66,19 @@
*/
@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)
- .last("LIMIT 1"));
- if(Objects.isNull(one)){
- String str = mealType == 1 ? "中餐" : "火锅";
- return AjaxResult.error("无"+str+"类型店铺");
- }
+// 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());
+ if(Objects.nonNull(mealType)){
+ wrapper.eq(TGoodsType::getMealType, mealType);
+ }
return AjaxResult.success(goodsTypeService.list(wrapper));
}
@@ -81,6 +88,9 @@
@ApiOperation( value = "添加商品分类")
@PostMapping(value = "/add")
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());
return AjaxResult.success(goodsTypeService.save(dto));
}
@@ -109,6 +119,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