From ffb7ccc533993f6b4bfe22353c5ff19f11fa490f Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 08 十二月 2022 15:02:40 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
index 75f77c8..79f80b0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopFlowerGoodsServiceImpl.java
@@ -199,9 +199,9 @@
         if (goodsDO == null || goodsDO.getDeleteStatus().equals(ComShopFlowerGoodsDO.deleteStatus.yes)) {
             return R.fail(403, "商品不存在");
         }
-        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
-            return R.fail(405, "商品已下架");
-        }
+//        if (!goodsDO.getStatus().equals(ComShopFlowerGoodsDO.status.sell)) {
+//            return R.fail(405, "商品已下架");
+//        }
 
         // 根据商品id查询商品规格信息
         List<ComShopFlowerGoodsAttrVO> goodsAttrList = new ArrayList<>();

--
Gitblit v1.7.1