'shop代码优化'

@@ -30,7 +30,7 @@ module.exports = {
         return api.get('', {
             method: 'web.brand.byDomain',
             domain: params.domain
-        });
+        }, {code: 200, cache: false});
     },
 
     /**
@@ -49,7 +49,7 @@ module.exports = {
             });
         }
 
-        return api.get('', finalParams);
+        return api.get('', finalParams, {code: 200, cache: false});
     },
 
     /**
@@ -61,7 +61,7 @@ module.exports = {
         return api.get('', {
             method: 'app.shopsdecorator.getList',
             shop_id: params.shopId
-        });
+        }, {code: 200, cache: false});
     },
 
     /**
@@ -93,7 +93,7 @@ module.exports = {
             }
         });
 
-        return api.get('', finalParams);
+        return api.get('', finalParams, {code: 200, cache: false});
     },
 
     /**
@@ -118,6 +118,6 @@ module.exports = {
                 method: 'app.favorite.add'
             });
         }
-        return api.get('', finalParams);
+        return api.get('', finalParams, {code: 200, cache: false});
     }
 };

@@ -22,73 +22,58 @@ const getShopData = params => {
 
     return shopApi.getBrandInfoByDomain({domain: params.domain}).then(result => {
 
-        if (result.code === 200) {
+        /* 品牌名称 */
+        Object.assign(finalResult, {
+            brandName: result.data.brand_name
+        });
 
-            /* 品牌名称 */
+        /* 品牌是否有店铺 */
+        if (result.data.shop_id) {
+
+            /* 是 BLK 的店铺 */
             Object.assign(finalResult, {
-                brandName: result.data.brand_name
+                isBlkShop: true,
+                shopId: result.data.shop_id
             });
 
-            /* 品牌是否有店铺 */
-            if (result.data.shop_id) {
+            return shopApi.getShopInfoData({
+                shopId: result.data.shop_id,
+                uid: params.uid
+
+                // uid: '8050882'
+            }).then(subResult => {
 
-                /* 是 BLK 的店铺 */
+                /* 取店铺的基本信息 */
                 Object.assign(finalResult, {
-                    isBlkShop: true,
-                    shopId: result.data.shop_id
+                    shopLogo: subResult.data.shop_logo,
+                    shopName: subResult.data.shop_name,
+                    shopIntro: subResult.data.shop_intro,
+                    isFav: subResult.data.is_favorite === 'Y'
                 });
 
-                return shopApi.getShopInfoData({
-                    shopId: result.data.shop_id,
-                    uid: params.uid
-
-                    // uid: '8050882'
-                }).then(subResult => {
-                    if (subResult.code === 200) {
-
-                        /* 取店铺的基本信息 */
-                        Object.assign(finalResult, {
-                            shopLogo: subResult.data.shop_logo,
-                            shopName: subResult.data.shop_name,
-                            shopIntro: subResult.data.shop_intro,
-                            isFav: subResult.data.is_favorite === 'Y'
-                        });
-
-                        /* 取资源位店铺背景图 */
-                        return shopApi.getShopsDecoratorList({shopId: result.data.shop_id}).then(thResult => {
-                            if (thResult.code === 200) {
-                                _.forEach(thResult.data.list, value => {
-
-                                    if (value.resource_name === 'shopTopBanner_app') {
-                                        Object.assign(finalResult, {
-                                            brandBg: JSON.parse(value.resource_data).shopSrc
-                                        });
-                                    }
-                                });
-
-                            } else {
-                                logger.info('getShopsDecoratorList api code no 200');
-                            }
-
-                            return finalResult;
-                        });
-                    } else {
-                        logger.error('getShopInfoData api code no 200');
-                    }
+                /* 取资源位店铺背景图 */
+                return shopApi.getShopsDecoratorList({shopId: result.data.shop_id}).then(thResult => {
+                    _.forEach(thResult.data.list, value => {
 
-                    return finalResult;
-                });
-            } else {
+                        if (value.resource_name === 'shopTopBanner_app') {
+                            Object.assign(finalResult, {
+                                brandBg: JSON.parse(value.resource_data).shopSrc
+                            });
+                        }
+                    });
 
-                /* 不是 BLK 的店铺 */
-                Object.assign(finalResult, {
-                    isBlkShop: false
+                    return finalResult;
                 });
 
-                logger.info('brand has no shop');
-            }
+            });
         } else {
-            logger.error('getBrandOriginData api code no 200');
+
+            /* 不是 BLK 的店铺 */
+            Object.assign(finalResult, {
+                isBlkShop: false
+            });
+
+            logger.info('brand has no shop');
         }
 
         return finalResult;
@@ -104,33 +89,27 @@ const getBrandShopGoodsData = params => {
     let finalResult = {};
 
     return shopApi.getBrandInfoByDomain({ domain: params.domain }).then(result => {
-        if (result.code === 200) {
-            return shopApi.getBrandShopGoodsOriginData(Object.assign(params, {
-                brand: result.data.id,
-                shopId: result.data.shop_id
-            })).then(subResult => {
-                if (subResult.code === 200 && subResult.data) {
-                    prettyFilter(subResult.data.filter);
-                    finalResult = {
-                        data: {
-                            productList: processProductList(subResult.data.product_list),
-                            filter: subResult.data.filter,
-                            page: subResult.data.page,
-                            pageTotal: subResult.data.page_total
-                        },
-                        code: 200
-                    };
-                } else {
-                    logger.error('getBrandShopGoodsOriginData api code no 200');
-                }
-
-                return camelCase(finalResult);
-            });
-        } else {
-            logger.error('getBrandInfoByDomain api code no 200');
-        }
+        return shopApi.getBrandShopGoodsOriginData(Object.assign(params, {
+            brand: result.data.id,
+            shopId: result.data.shop_id
+        })).then(subResult => {
+            if (subResult.data) {
+                prettyFilter(subResult.data.filter);
+                finalResult = {
+                    data: {
+                        productList: processProductList(subResult.data.product_list),
+                        filter: subResult.data.filter,
+                        page: subResult.data.page,
+                        pageTotal: subResult.data.page_total
+                    },
+                    code: 200
+                };
+            } else {
+                logger.error('getBrandShopGoodsOriginData api no data');
+            }
 
-        return camelCase(finalResult);
+            return camelCase(finalResult);
+        });
     });
 };