From 17afbc2125b4df86f9d7846c02ddc7bc4a8ccc99 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 31 十月 2024 16:48:47 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 4c410e1..b5e28f5 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>
@@ -46,13 +47,13 @@
@ApiOperation( value = "查询商品分类列表")
@PostMapping(value = "/list")
public AjaxResult<List<TGoodsType>> list() {
- Long shopId = tokenService.getLoginUser().getObjectId();
- Integer roleType = tokenService.getLoginUser().getRoleType();
- LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
- if(roleType != 1){
- wrapper.eq(TGoodsType::getShopId, shopId);
- }
- return AjaxResult.success(goodsTypeService.list(wrapper));
+// Long shopId = tokenService.getLoginUser().getObjectId();
+// Integer roleType = tokenService.getLoginUser().getRoleType();
+// LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
+// if(roleType != 1){
+// wrapper.eq(TGoodsType::getShopId, shopId);
+// }
+ return AjaxResult.success(goodsTypeService.list());
}
/**
@@ -62,12 +63,16 @@
@GetMapping(value = "/getList")
public AjaxResult<List<TGoodsType>> getList(@RequestParam("mealType") Integer mealType) {
// 获取餐饮分类店铺id
- TShop one = shopService.getOne(Wrappers.lambdaQuery(TShop.class)
- .eq(TShop::getMealType, mealType)
- .last("LIMIT 1"));
- LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TGoodsType::getShopId, one.getId());
- return AjaxResult.success(goodsTypeService.list(wrapper));
+// 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());
}
/**
--
Gitblit v1.7.1