From 4db8023227b3900740b8be361c436ddadb1d0585 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 08:42:06 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   36 ++++++++++++++++++++++++++++++++++++
 1 files changed, 36 insertions(+), 0 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 bd6f4e6..4fd3c4b 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
@@ -10,6 +10,7 @@
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.redis.annotation.DistributedLock;
 import com.ruoyi.other.api.domain.Goods;
 import com.ruoyi.other.api.domain.VipSetting;
 import com.ruoyi.other.api.feignClient.VipSettingClient;
@@ -209,5 +210,40 @@
         return R.ok(goods);
     }
 
+
+    /**
+     * 编辑商品
+     * @param goods
+     * @return
+     */
+    @PostMapping("/editGoodsList")
+    public R editGoodsList(@RequestBody List<Goods> goods){
+        goodsService.updateBatchById(goods);
+        return R.ok();
+    }
+
+
+    /**
+     * 商品销量增加
+     */
+    @PutMapping("/editGoodsNum")
+    @DistributedLock(lockNamePre = "#goods_lock", lockNamePost = "#goodsId")
+    public R<Void> editGoodsNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("num") Integer num){
+        Goods goods = goodsService.getById(goodsId);
+        goods.setSaleNum(goods.getSaleNum() + num);
+        goodsService.updateById(goods);
+        return R.ok();
+    }
+
+
+    /**
+     * 获取所有商品
+     * @return
+     */
+    @PostMapping("/getAllGoods")
+    public R<List<Goods>> getAllGoods(){
+        List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
+        return R.ok(list);
+    }
 }
 

--
Gitblit v1.7.1