Merge remote-tracking branch 'origin/hotfix/guang'

@@ -155,16 +155,11 @@ class PlusstarData
                     if (isset($getUidBrandFav['code']) && $getUidBrandFav['code'] == 200) {
                         $cached['getUidBrandFav'] = true;
                     }else{
-                        $getUidBrandFavResult = false;
+                        $cached['getUidBrandFav'] = false;
                     }
 
                 }
-            }else{
-                $getUidBrandFavResult = false;
-            }
 
-            if (!empty($cached)) {
-                $cached['getUidBrandFav'] = $getUidBrandFavResult;
                 return $cached;
             }
         }
@@ -177,14 +172,18 @@ class PlusstarData
         $param['client_secret'] = Sign::getSign($param);
         $brandInfo = Yohobuy::get(SERVICE_URL . self::URI_BRANDINFO_PLUSSTAR_NEW . 'getbrandinfo', $param, 3600);
 
-        if (!isset($brandInfo['data']['brand_id'])) {
-            // 再尝试获取二级缓存(master), 有数据则直接返回.
-            $cached = Cache::get($key, 'slave');
-            if (!empty($cached)) {
-                return $cached;
-            }
-            return $result;
-        } else {
+//        if (!isset($brandInfo['data']['brand_id'])) {
+//            // 再尝试获取二级缓存(master), 有数据则直接返回.
+//            $cached = Cache::get($key, 'slave');
+//            if (!empty($cached)) {
+//                return $cached;
+//            }
+//            return $result;
+//        } else {
+//            $result['getBrandInfo'] = $brandInfo;
+//        }
+
+        if (isset($brandInfo['data']['brand_id'])) {
             $result['getBrandInfo'] = $brandInfo;
         }