blame | history | patch | commit | commitdiff | ignore whitespace
xin
2025-06-24 9a66c01477b81f8d429a45b0a2922ab75e2e9c64 
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java


@@ -5,9 +5,8 @@


import cn.hutool.core.lang.tree.TreeNodeConfig;


import cn.hutool.core.lang.tree.TreeUtil;


import cn.hutool.core.util.BooleanUtil;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.oying.annotation.Log;


import com.oying.modules.pc.common.core.domain.R;


import com.oying.utils.R;


import com.oying.modules.pc.store.domain.StoreCategory;


import com.oying.modules.pc.store.domain.dto.*;


import com.oying.modules.pc.store.service.StoreCategoryService;


@@ -43,8 +42,8 @@


    @ApiOperation("查询店铺类目")


    //@PreAuthorize("@el.check('merchant:storeCategory:list')" +


    //        " and @storeMerchantOwnershipService.check(#storeId)")


    public ResponseEntity<?> getList(@PathVariable Long storeId,


                                     @RequestParam(value = "recursive", required = false) Boolean recursive) {


    public ResponseEntity<?> getStoreCategories(@PathVariable Long storeId,


                                                @RequestParam(value = "recursive", required = false) Boolean recursive) {




        StoreCategoryQueryCriteria criteria = new StoreCategoryQueryCriteria();


        criteria.setStoreId(storeId);


@@ -78,7 +77,7 @@


    @ApiOperation("查询店铺类目")


    //@PreAuthorize("@el.check('merchant:storeCategory:list')" +


    //        " and @storeMerchantOwnershipService.check(#storeId)")


    public ResponseEntity<?> getById(@PathVariable Long categoryId,


    public ResponseEntity<?> getStoreCategoryById(@PathVariable Long categoryId,


                                     @RequestParam(value = "recursive", required = false) Boolean recursive) {




        StoreCategory storeCategory = storeCategoryService.getById(categoryId);