From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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 d798ed3..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
@@ -2,14 +2,18 @@
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 com.ruoyi.other.service.GoodsService;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
@@ -30,31 +34,33 @@
public class GoodsCategoryController extends BaseController {
@Resource
private GoodsCategoryService goodsCategoryService;
+ @Resource
+ private GoodsService goodsService;
@PostMapping("/addGoodsCategory")
- @ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
+ @ApiOperation(value = "商品管理-商品分类-添加", tags = {"管理后台"})
public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
goodsCategoryService.save(goodsCategory);
return R.ok();
}
@PutMapping("/updateGoodsCategory")
- @ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
+ @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 = {"管理后台-商品分类"})
+ @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())
@@ -63,9 +69,11 @@
}
@DeleteMapping("/delete")
- @ApiOperation(value = "删除商品分类", tags = {"管理后台-商品分类"})
+ @ApiOperation(value = "商品管理-商品分类-删除", tags = {"管理后台"})
public R<Void> delete(@RequestParam("id") Integer id){
- goodsCategoryService.removeById(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();
}
@@ -76,6 +84,7 @@
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
public R<List<GoodsCategory>> indexlist(){
List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
+ .eq(GoodsCategory::getDelFlag, 0)
.orderByDesc(GoodsCategory::getCreateTime)
.last("limit 8")
.list();
@@ -84,7 +93,7 @@
@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