Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-08 c2c8f1fcd02448bf8ae632c19d9a802b8a1c4024

Merge branch 'local_20221104' into huacheng_test

 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<>();