From b576d6c3f90817ba2ab1bda2dabd94bf1031a961 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 17:02:08 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 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 9140c0b..049d1f5 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,6 +2,7 @@
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
@@ -77,6 +78,16 @@
     @ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
     public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
         goodsService.updateManageGoods(goods);
+        if (goods.getType()==2){
+            goods.setAppointStore(2);
+            goodsService.updateById(goods);
+        }
+        if (goods.getType()==1){
+            LambdaUpdateWrapper<Goods> goodsLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+            goodsLambdaUpdateWrapper.set(Goods::getDistributionMode,null);
+            goodsLambdaUpdateWrapper.eq(Goods::getId, goods.getId());
+            goodsService.update(goodsLambdaUpdateWrapper);
+        }
         return R.ok();
     }
 
@@ -198,5 +209,27 @@
         return R.ok(goods);
     }
 
+
+    /**
+     * 编辑商品
+     * @param goods
+     * @return
+     */
+    @PostMapping("/editGoodsList")
+    public R editGoodsList(@RequestBody List<Goods> goods){
+        goodsService.updateBatchById(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