修改

xuhy

2025-03-13 8d9596f650523d8b6981657bd26078cb1ec09885

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

@@ -5,8 +5,10 @@
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.TFoundationConfig;
import com.ruoyi.system.domain.TGoodsType;
import com.ruoyi.system.domain.TShop;
import com.ruoyi.system.service.TFoundationConfigService;
import com.ruoyi.system.service.TGoodsTypeService;
import com.ruoyi.system.service.TShopService;
import io.swagger.annotations.Api;
@@ -33,12 +35,14 @@
    private final TGoodsTypeService goodsTypeService;
    private final TokenService tokenService;
    private final TShopService shopService;
    private final TFoundationConfigService foundationConfigService;

    @Autowired
    public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService) {
    public TGoodsTypeController(TGoodsTypeService goodsTypeService, TokenService tokenService, TShopService shopService, TFoundationConfigService foundationConfigService) {
        this.goodsTypeService = goodsTypeService;
        this.tokenService = tokenService;
        this.shopService = shopService;
        this.foundationConfigService = foundationConfigService;
    }

    /**
@@ -52,7 +56,11 @@
        TShop shop = shopService.getById(shopId);
        LambdaQueryWrapper<TGoodsType> wrapper = new LambdaQueryWrapper<>();
        if(roleType != 1){
            wrapper.eq(TGoodsType::getMealType, shop.getMealType());
            if(roleType == 2){
                wrapper.eq(TGoodsType::getMealType, shop.getMealType());
            }else {
                wrapper.isNull(TGoodsType::getMealType);
            }
        }
        return AjaxResult.success(goodsTypeService.list(wrapper));
    }
@@ -87,7 +95,7 @@
        Long shopId = tokenService.getLoginUser().getObjectId();
        TShop shop = shopService.getById(shopId);
        dto.setMealType(shop.getMealType());
        dto.setShopId(tokenService.getLoginUser().getObjectId());
        dto.setShopId(shopId);
        return AjaxResult.success(goodsTypeService.save(dto));
    }

@@ -115,6 +123,12 @@
    @ApiOperation( value = "删除商品分类")
    @DeleteMapping(value = "/deleteById")
    public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) {
        // 查询分类是否在生成配置里面存在
        long count = foundationConfigService.count(Wrappers.lambdaQuery(TFoundationConfig.class)
                .eq(TFoundationConfig::getTypeId, id));
        if(count>0){
            return AjaxResult.warn("该分类在基础设置中正在使用，无法删除");
        }
        return AjaxResult.success(goodsTypeService.removeById(id));
    }