Merge remote-tracking branch 'origin/master-v2'

gongzuming

2024-09-20 e425e5d101e1d48e40674a2a801efb8dd060e8a5

 src/main/java/com/mzl/flower/web/flower/FlowerCategoryController.java

@@ -10,6 +10,7 @@
import com.mzl.flower.dto.response.flower.FlowerCategoryDTO;
import com.mzl.flower.dto.response.flower.FlowerCategoryTreeDTO;
import com.mzl.flower.service.flower.FlowerCategoryService;
import com.mzl.flower.service.flower.FlowerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,6 +34,9 @@
    @Autowired
    private FlowerCategoryService categoryService;

    @Autowired
    private FlowerService flowerService;

    @PostMapping("/tree/new")
    @ApiOperation(value = "新增商品分类")
    public ResponseEntity<ReturnDataDTO> addCategory(@RequestBody FlowerCategoryCreateDTO dto) {
@@ -42,7 +46,9 @@
    @PostMapping("/tree/edit")
    @ApiOperation(value = "编辑商品分类")
    public ResponseEntity<ReturnDataDTO> updateCategory(@RequestBody FlowerCategoryUpdateDTO dto) {
        return returnData(R.SUCCESS.getCode(), categoryService.updateCategory(dto));
        Long category = categoryService.updateCategory(dto);
        flowerService.updateCategoryInfo(category);
        return returnData(R.SUCCESS.getCode(), category);
    }

    @GetMapping("/tree/view")
@@ -60,6 +66,12 @@
        return returnData(R.SUCCESS.getCode(), categoryService.selectCategoryTree(dto));
    }

    @GetMapping("/list")
    @ApiOperation(value = "获取商品分类列表")
    public ResponseEntity<ReturnDataDTO<List<FlowerCategoryTreeDTO>>> selectCategoryList(FlowerCategoryQueryDTO dto){
        return returnData(R.SUCCESS.getCode(), categoryService.selectCategoryList(dto));
    }

    @GetMapping("/tree/delete")
    @ApiOperation(value = "删除商品分类")
    @ApiImplicitParams({