From c08e13eb2c875a160b3f30acaa6d01306c19b444 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 一月 2025 17:59:36 +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 |    4 +++-
 1 files changed, 3 insertions(+), 1 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 b4b019b..e97d3a5 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
@@ -137,7 +137,9 @@
         if(0 < count){
             return R.fail("商品已被会员配置使用,不能删除");
         }
-        goodsService.removeById(goodsId);
+        Goods goods = goodsService.getById(goodsId);
+        goods.setDelFlag(1);
+        goodsService.updateById(goods);
         return R.ok();
     }
 

--
Gitblit v1.7.1