From 32ccda8d0192f7560ab2a0700d66a903cd0dc9ce Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 10:52:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 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 ba1e75a..aa66681 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,17 +1,12 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.other.service.GoodsCategoryService;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -32,7 +27,35 @@
@Resource
private GoodsCategoryService goodsCategoryService;
- @PostMapping("/index/list")
+
+ @PostMapping("/addGoodsCategory")
+ @ApiOperation(value = "添加商品分类", tags = {"管理后台-商品分类"})
+ public R<Void> addGoodsCategory(GoodsCategory goodsCategory){
+ goodsCategoryService.save(goodsCategory);
+ return R.ok();
+ }
+
+ @PutMapping("/updateGoodsCategory")
+ @ApiOperation(value = "修改商品分类", tags = {"管理后台-商品分类"})
+ public R<Void> updateGoodsCategory(GoodsCategory goodsCategory){
+ goodsCategoryService.updateById(goodsCategory);
+ return R.ok();
+ }
+
+ @GetMapping("/getGoodsCategoryById")
+ @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());
+ }
+
+ @GetMapping("/index/list")
@ApiOperation(value = "商品分类", tags = {"小程序-首页"})
public R<List<GoodsCategory>> indexlist(){
List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
@@ -40,12 +63,12 @@
.last("limit 8")
.list()
;
- return R.ok(list);
+ return R.ok(indexlist);
}
@GetMapping("/list")
@ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
- public AjaxResult list(){
- return AjaxResult.success(goodsCategoryService.list());
+ public R<List<GoodsCategory>> list(){
+ return R.ok(goodsCategoryService.list());
}
}
--
Gitblit v1.7.1