From 660f4451c140a9da1f4bb92721a403b128dbdaf7 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 30 十月 2024 17:15:26 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 3507500..4c410e1 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
@@ -1,11 +1,14 @@
package com.ruoyi.web.controller.api;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.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;
@@ -28,11 +31,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,7 +47,27 @@
@PostMapping(value = "/list")
public AjaxResult<List<TGoodsType>> list() {
Long shopId = tokenService.getLoginUser().getObjectId();
- return AjaxResult.success(goodsTypeService.list(Wrappers.<TGoodsType>lambdaQuery().eq(TGoodsType::getShopId, shopId)));
+ Integer roleType = tokenService.getLoginUser().getRoleType();
+ LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
+ if(roleType != 1){
+ wrapper.eq(TGoodsType::getShopId, shopId);
+ }
+ return AjaxResult.success(goodsTypeService.list(wrapper));
+ }
+
+ /**
+ * 查询商品分类列表
+ */
+ @ApiOperation( value = "查询商品分类列表-后台使用")
+ @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));
}
/**
--
Gitblit v1.7.1