From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 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 caf8d66..2d86a41 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
@@ -78,6 +78,18 @@
     }
 
     /**
+     * 更新上/下架状态
+     */
+    @PutMapping("/manageGoodsStatus/{goodsId}/{status}")
+    @ApiOperation(value = "商品上/下架", tags = {"管理后台-商品管理"})
+    public R<Void> manageGoodsStatus(@PathVariable("goodsId") Long goodsId,
+                                     @PathVariable("status") Integer status){
+        goodsService.lambdaUpdate().eq(Goods::getId, goodsId).set(Goods::getStatus, status).update();
+        return R.ok();
+    }
+
+
+    /**
      * 后台商品删除
      */
     @DeleteMapping("/manageGoodsDelete/{goodsId}")
@@ -91,7 +103,7 @@
      * 获取会员等级信息
      */
     @GetMapping("/getVipSetting")
-    @ApiOperation(value = "会员等级信息", tags = {"小程序-个人中心-优惠劵"})
+    @ApiOperation(value = "会员等级信息", tags = {"管理后台-商品管理"})
     public R<List<VipSetting>> getVipSetting(){
         return settingClient.info();
     }
@@ -158,7 +170,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