Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/shop/ShopService.php

@@ -162,13 +162,13 @@ class ShopService
                 throw new ShopException(['cus' => 4]);
             }
             $colums['shop_name'] = $name;
+            $subShopInfo = SubShop::getRecord(['shop_name' => $name]);
+            if (!empty($subShopInfo) && $subShopInfo['sub_shop_id'] != $where['sub_shop_id']) {
+                throw new ShopException(['cus' => 6]);
+            }
         }
-
-        $subShopInfo = SubShop::getRecord(['shop_name' => $name]);
-
-        if (!empty($subShopInfo) && $subShopInfo['sub_shop_id'] != $where['sub_shop_id']) {
-            throw new ShopException(['cus' => 6]);
-        }
+        
+        
 
         
  
@@ -210,7 +210,7 @@ class ShopService
         }
         
         if (empty($subShop)) {
-            throw new ShopException(['cus' => 6]);
+            throw new ShopException(['cus' => 10]);
         }
         return $subShop;
     }