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 | 37 +++++++++++++++++++++++++------------
1 files changed, 25 insertions(+), 12 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 229ea56..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
@@ -6,13 +6,16 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.domain.TGoodsType;
+import com.ruoyi.system.domain.TShop;
import com.ruoyi.system.service.TGoodsTypeService;
+import com.ruoyi.system.service.TShopService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
* <p>
@@ -29,11 +32,13 @@
private final TGoodsTypeService goodsTypeService;
private final TokenService tokenService;
+ private final TShopService shopService;
@Autowired
- public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService) {
+ public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService) {
this.goodsTypeService = goodsTypeService;
this.tokenService = tokenService;
+ this.shopService = shopService;
}
/**
@@ -42,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());
}
/**
@@ -56,10 +61,18 @@
*/
@ApiOperation( value = "查询商品分类列表-后台使用")
@GetMapping(value = "/getList")
- public AjaxResult<List<TGoodsType>> getList(@RequestParam("shopId") Long shopId) {
- LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TGoodsType::getShopId, shopId);
- return AjaxResult.success(goodsTypeService.list(wrapper));
+ 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"));
+// 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