code review by fei.hong: do format guang plusstar codes

@@ -51,26 +51,23 @@ class PlusstarModel
         }
         }
 
 
         $result = array();
         $result = array();
-        $brandList = PlusstarData::firstBrandList($gender, $channel);
-        if (!empty($brandList['recom']['data']['list'][0]['data'])) {
-            $result['ps']['star'] = self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true);
-            //$result['ps']['sName'] = isset($brandList['recom']['data']['brand_type_name']) ? $brandList['recom']['data']['brand_type_name'] : '';
-        }
-        if (!empty($brandList['all']['data']['list'][0]['data'])) {
-            $result['ps']['plus'] = self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true);
-            //$result['ps']['pName'] = isset($brandList['all']['data']['brand_type_name']) ? $brandList['all']['data']['brand_type_name'] : '';
-        }
         
         
-        if (USE_CACHE) {
+        $brandList = PlusstarData::firstBrandList($gender, $channel);
         // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
         // 接口调用异常时, 不害怕，从我们的二级缓存(slave)里再取数据.
-            if (empty($result)) {
+        if (empty($brandList['recom']['data']['list'][0]['data']) || empty($brandList['all']['data']['list'][0]['data'])) {
+            if (USE_CACHE) {
                 $result = Cache::get($key, 'slave');
                 $result = Cache::get($key, 'slave');
             }
             }
+            return $result;
+        }
+        
+        $result['ps']['star'] = self::formatData($brandList['recom']['data']['list'][0]['data'], $gender, true);
+        $result['ps']['plus'] = self::formatData($brandList['all']['data']['list'][0]['data'], $gender, true);
+
         // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
         // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
-            else {
+        if (USE_CACHE) {
             Cache::set($key, $result);
             Cache::set($key, $result);
         }
         }
-        }
 
 
         return $result;
         return $result;
     }
     }