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

@@ -921,6 +921,9 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
 };
 
 let _getShopsInfo = (brandId) => {
+    if(!brandId) {
+        return Promise.resolve([]);
+    }
     return api.get('', {
         method: 'app.shop.queryShopsByBrandId',
         brand_id: _.toString(brandId)
@@ -1006,7 +1009,7 @@ let getProductData = (data) => {
             }
             result = result.data;
             return Promise.all([
-                _getShopsInfo(result.brandInfo.brandId),
+                _getShopsInfo(_.get(result, 'brandInfo.brandId', 0)),
                 _getPromotionInfo(result.productSkn),
                 comment.getCommentInfo({
                     productId: result.productId