From ff2ef0cfdaf6c2217c728d4c7cd91ea47e1f3ac9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 十二月 2024 16:11:04 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index 7864100..d798ed3 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -34,14 +34,14 @@
@PostMapping("/addGoodsCategory")
@ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
- public R<Void> addGoodsCategory(GoodsCategory goodsCategory){
+ public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.save(goodsCategory);
return R.ok();
}
@PutMapping("/updateGoodsCategory")
@ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
- public R<Void> updateGoodsCategory(GoodsCategory goodsCategory){
+ public R<Void> updateGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.updateById(goodsCategory);
return R.ok();
}
@@ -55,13 +55,23 @@
@GetMapping("/getList")
@ApiOperation(value = "商品分类列表", tags = {"管理后台-商品分类"})
- public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer PageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){
+ public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){
Page<GoodsCategory> page = goodsCategoryService.lambdaQuery()
.like(StringUtils.isNotEmpty(goodsCategory.getName()),GoodsCategory::getName, goodsCategory.getName())
- .page(Page.of(PageNum, pageSize));
+ .page(Page.of(pageNum, pageSize));
return R.ok(page);
}
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "删除商品分类", tags = {"管理后台-商品分类"})
+ public R<Void> delete(@RequestParam("id") Integer id){
+ goodsCategoryService.removeById(id);
+ return R.ok();
+ }
+
+
+
+
@GetMapping("/index/list")
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
public R<List<GoodsCategory>> indexlist(){
--
Gitblit v1.7.1