修改

xuhy

2024-10-31 17afbc2125b4df86f9d7846c02ddc7bc4a8ccc99

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java

@@ -1,17 +1,21 @@
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;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -28,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;
    }

    /**
@@ -41,8 +47,32 @@
    @ApiOperation( value = "查询商品分类列表")
    @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)));
//        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());
    }

    /**
     * 查询商品分类列表
     */
    @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"));
//        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());
    }

    /**