修改

xuhy

2024-10-31 bcd72429c275badce8d52c52719099fe840e4137

 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>
@@ -48,9 +49,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));
    }
@@ -60,13 +62,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"));
//        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));
    }

@@ -76,6 +84,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));
    }