From 6d90aa0d86d4ef7d1eb4eda5dab1c10dc9e9df26 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 11 五月 2021 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test

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

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
index 010e015..d414e90 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComShopStoreServiceImpl.java
@@ -94,7 +94,8 @@
     public R shopStoreDetail(PageComShopStoreDTO comShopStoreDTO) {
         //查询店铺
         ComShopStoreDO storeDO = this.baseMapper.selectById(comShopStoreDTO.getStoreId());
-        if (storeDO == null) {
+        boolean storeDeleted = storeDO!=null && 2==storeDO.getDeleteStatus();
+        if (storeDO == null || storeDeleted) {
             return R.fail(401, "店铺不存在");
         }
         if (storeDO.getStatus().equals(ComShopStoreDO.status.no)) {

--
Gitblit v1.7.1