店铺商品列表

@@ -5,11 +5,14 @@
  * Time: 13:51
  * Time: 13:51
  */
  */
 'use strict';
 'use strict';
+const path = require('path');
 const api = global.yoho.API;
 const api = global.yoho.API;
 const helpers = global.yoho.helpers;
 const helpers = global.yoho.helpers;
 const brandApi = require('./brand-api');
 const brandApi = require('./brand-api');
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
 const _ = require('lodash');
 const _ = require('lodash');
+const processProductList = require(path.join(global.utils, '/beautify/product')).processProductList;
+const camelCase = global.yoho.camelCase;
 
 
 /**
 /**
  * 处理品牌一览品牌列表数据
  * 处理品牌一览品牌列表数据
@@ -111,13 +114,18 @@ const getBrandData = params => {
 const getBrandShopGoodsData = params => {
 const getBrandShopGoodsData = params => {
     let finalResult = {};
     let finalResult = {};
 
 
-    /* TODO 获取店铺商品暂时没有接口 */
     return api.all([brandApi.getBrandShopGoodsOriginData(params)]).then(result => {
     return api.all([brandApi.getBrandShopGoodsOriginData(params)]).then(result => {
         if (result[0].code === 200) {
         if (result[0].code === 200) {
-            return finalResult;
+            Object.assign(finalResult, {
+                data: {
+                  productList: processProductList(result[0].data.productList)
+                }
+            });
         } else {
         } else {
             logger.error('getBrandShopGoodsOriginData api code no 200');
             logger.error('getBrandShopGoodsOriginData api code no 200');
         }
         }
+
+        return camelCase(finalResult);
     });
     });
 };
 };
 
 
@@ -127,8 +135,6 @@ const getBrandShopGoodsData = params => {
  * @returns {*|Promise.<TResult>}
  * @returns {*|Promise.<TResult>}
  */
  */
 const collectShopData = params => {
 const collectShopData = params => {
-
-    /* TODO 收藏店铺接口返回状态处理 */
     return api.all([brandApi.collectShopOriginData(params)]).then(result => {
     return api.all([brandApi.collectShopOriginData(params)]).then(result => {
         return result[0];
         return result[0];
     });
     });