From c980c8c2cd9403393db6a3f42705612a0a4d4511 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 15:49:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 68 +++++++++++++++++++++++++++++++---
1 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index 8b1b86b..5c71417 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -2,10 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+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.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.Goods;
+import com.ruoyi.other.api.domain.VipSetting;
+import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.other.service.GoodsService;
import com.ruoyi.other.vo.GoodsVO;
import io.swagger.annotations.Api;
@@ -26,18 +30,70 @@
*/
@RestController
@RequestMapping("/goods")
-@Api(tags = "商品")
+@Api("商品")
public class GoodsController extends BaseController {
@Resource
private GoodsService goodsService;
+ @Resource
+ private VipSettingClient settingClient;
/**
* 添加商品
*/
@PostMapping("/addGoods")
- @ApiOperation(value = "添加商品", tags = {"管理后台-发布商品"})
+ @ApiOperation(value = "发布商品", tags = {"管理后台-商品管理"})
public R<Void> addGoods(@RequestBody Goods goods) {
+ goodsService.addGoods(goods);
return R.ok();
+ }
+
+ /**
+ * 管理后台商品列表
+ */
+ @GetMapping("/manageGoodsList")
+ @ApiOperation(value = "商品列表", tags = {"管理后台-商品管理"})
+ public R<IPage<Goods>> manageGoodsList(@ApiParam("页码") @RequestParam Integer pageNum,
+ @ApiParam("每一页数据大小") Integer pageSize,
+ Goods goods){
+ return R.ok(goodsService.getManageGoodsList(new Page<>(pageNum, pageSize), goods));
+ }
+
+ /**
+ * 后台商品详情
+ */
+ @GetMapping("/manageGoodsDetail/{goodsId}")
+ @ApiOperation(value = "商品详情", tags = {"管理后台-商品管理"})
+ public R<Goods> manageGoodsDetail(@PathVariable("goodsId") Long goodsId){
+ return R.ok(goodsService.getManageGoodsDetail(goodsId));
+ }
+
+ /**
+ * 后台商品修改
+ */
+ @PutMapping("/manageGoodsUpdate")
+ @ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
+ public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
+ goodsService.updateManageGoods(goods);
+ return R.ok();
+ }
+
+ /**
+ * 后台商品删除
+ */
+ @DeleteMapping("/manageGoodsDelete/{goodsId}")
+ @ApiOperation(value = "商品删除", tags = {"管理后台-商品管理"})
+ public R<Void> manageGoodsDelete(@PathVariable("goodsId") Long goodsId){
+ goodsService.removeById(goodsId);
+ return R.ok();
+ }
+
+ /**
+ * 获取会员等级信息
+ */
+ @GetMapping("/getVipSetting")
+ @ApiOperation(value = "会员等级信息", tags = {"管理后台-商品管理"})
+ public R<List<VipSetting>> getVipSetting(){
+ return settingClient.info();
}
@@ -46,7 +102,7 @@
* 商品列表
*/
@GetMapping("/goodsList")
- @ApiOperation(value = "商品列表", tags = {"小程序-商城-首页-热门商品列表", "首页热门商品-小程序"})
+ @ApiOperation(value = "热门商品列表", tags = {"小程序-商城-首页", "小程序-首页"})
public R<TableDataInfo> goodsList(Goods goods){
startPage();
return R.ok(getDataTable(goodsService.goodsList(goods)));
@@ -57,7 +113,7 @@
* 指定门店商品
*/
@GetMapping("/getGoodsListByShopId")
- @ApiOperation(value = "商品列表", tags = {"小程序-首页-门店详情-商品购买列表"})
+ @ApiOperation(value = "商品购买列表", tags = {"小程序-首页-门店详情"})
public R<TableDataInfo> getGoodsListByShopId(@ApiParam("门店id") @RequestParam Integer shopId) {
startPage();
return R.ok(getDataTable(goodsService.getGoodsListByShopId(shopId)));
@@ -68,7 +124,7 @@
* 商品详情
*/
@GetMapping("/goodsDetail/{goodsId}")
- @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页-商品详情"})
+ @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){
return R.ok(goodsService.goodsDetail(goodsId));
}
@@ -102,7 +158,7 @@
@ResponseBody
@PostMapping("/getGoodsByIds")
public R<List<Goods>> getGoodsByIds(@RequestParam("ids") String [] ids){
- List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).eq(Goods::getStatus, 0).list();
+ List<Goods> goods = goodsService.lambdaQuery().in(Goods::getId, ids).list();
return R.ok(goods);
}
--
Gitblit v1.7.1