From acccff9860b271d55c55dc87486f7c20b9896e6c Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 16:19:54 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 55 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 15 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 aa66681..e175199 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
@@ -1,12 +1,20 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.other.api.domain.Goods;
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.Api;
+import com.ruoyi.other.service.GoodsService;
+import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -22,53 +30,70 @@
*/
@RestController
@RequestMapping("/goods-category")
-@Api(tags = "商品分类")
-public class GoodsCategoryController {
+@Api("商品分类")
+public class GoodsCategoryController extends BaseController {
@Resource
private GoodsCategoryService goodsCategoryService;
+ @Resource
+ private GoodsService goodsService;
@PostMapping("/addGoodsCategory")
- @ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
- public R<Void> addGoodsCategory(GoodsCategory goodsCategory){
+ @ApiOperation(value = "商品管理-商品分类-添加", tags = {"管理后台"})
+ public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.save(goodsCategory);
return R.ok();
}
@PutMapping("/updateGoodsCategory")
- @ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
- public R<Void> updateGoodsCategory(GoodsCategory goodsCategory){
+ @ApiOperation(value = "商品管理-商品分类-修改", tags = {"管理后台"})
+ public R<Void> updateGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.updateById(goodsCategory);
return R.ok();
}
@GetMapping("/getGoodsCategoryById")
- @ApiOperation(value = "商品分类详情", tags = {"管理后台-商品分类"})
+ @ApiOperation(value = "商品管理-商品分类-详情", tags = {"管理后台"})
public R<GoodsCategory> getGoodsCategoryById(@RequestParam("id") Integer id){
return R.ok(goodsCategoryService.getById(id));
}
@GetMapping("/getList")
- @ApiOperation(value = "商品分类列表", tags = {"管理后台-商品分类"})
- public R<List<GoodsCategory>> list(IPage<GoodsCategory> page, GoodsCategory goodsCategory){
- return R.ok(goodsCategoryService.list());
+ @ApiOperation(value = "商品管理-商品分类-列表", tags = {"管理后台"})
+ 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));
+ return R.ok(page);
}
+
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "商品管理-商品分类-删除", tags = {"管理后台"})
+ public R<Void> delete(@RequestParam("id") Integer id){
+ List<Goods> list = goodsService.lambdaQuery().eq(Goods::getGoodsCategoryId, id).list();
+ if (!list.isEmpty())return R.fail("当前分类已关联商品,不可删除");
+ goodsCategoryService.update(new LambdaUpdateWrapper<GoodsCategory>().eq(GoodsCategory::getId, id).set(GoodsCategory::getDelFlag, 1));
+ return R.ok();
+ }
+
+
+
@GetMapping("/index/list")
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
public R<List<GoodsCategory>> indexlist(){
List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
+ .eq(GoodsCategory::getDelFlag, 0)
.orderByDesc(GoodsCategory::getCreateTime)
.last("limit 8")
- .list()
- ;
+ .list();
return R.ok(indexlist);
}
@GetMapping("/list")
@ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
public R<List<GoodsCategory>> list(){
- return R.ok(goodsCategoryService.list());
+ return R.ok(goodsCategoryService.list(new LambdaQueryWrapper<GoodsCategory>().eq(GoodsCategory::getDelFlag, 0)));
}
}
--
Gitblit v1.7.1