Merge branch 'feature/removCamel' of git.yoho.cn:fe/yohobuy-node into feature/removCamel

沈志敏
Commit 92e4763ba0c12cfb405686e9cbd918414c3a72ac 2 parents d2470fb9 92f4b680
Showing 1 changed file with 29 additions and 28 deletions
utils/product-process.js
--- a/utils/product-process.js
View file @92e4763
+++ b/utils/product-process.js
View file @92e4763
@@ -14,10 +14,10 @@ const images = require(`${global.utils}/images`);
  */
 const procProductImg = (product, gender) => {
     if (gender === '2,3') {
-        return product.cover2 || product.cover1 || product.imagesUrl || '';
+        return product.cover_2 || product.cover_1 || product.images_url || '';
     }
-    return product.cover1 || product.cover2 || product.imagesUrl || '';
+    return product.cover_1 || product.cover_2 || product.images_url || '';
 };
@@ -28,10 +28,10 @@ const procProductImg = (product, gender) => {
  */
 const handleGoodsListData = (origin) => {
     _.forEach(origin, (value, key) => {
-        if (!_.isEmpty(value.goodsList)) {
-            _.forEach(value.goodsList, (subValue, subKey) => {
-                origin[key].goodsList[subKey].url =
-                    helpers.urlFormat(`/product/pro_${value.productId}_${subValue.goodsId}/${value.cnAlphabet}.html`);
+        if (!_.isEmpty(value.goods_list)) {
+            _.forEach(value.goods_list, (subValue, subKey) => {
+                origin[key].goods_list[subKey].url =
+                    helpers.urlFormat(`/product/pro_${value.product_id}_${subValue.goods_id}/${value.cn_alphabet}.html`);
             });
         }
     });
@@ -80,37 +80,38 @@ exports.processProductList = (list, options) => {
     }, options);
     // TODO:
-    list = camelCase(list);
+    //console.log(list);
+    //list = camelCase(list);
     _.forEach(list, (product) => {
         // 商品信息有问题，则不显示
-        if (!product.productSkn || !product.goodsList.length) {
+        if (!product.product_skn || !product.goods_list.length) {
             return;
         }
         // 如果库存为0,显示已抢完
-        if (product.storageNum === 0 && product.status === 1) {
+        if (product.storage_num === 0 && product.status === 1) {
             product.isSaleOut = true;
         }
         // 市场价和售价一样，则不显示市场价, 不显示折扣信息
-        if (product.marketPrice === product.salesPrice) {
-            delete product.marketPrice;
+        if (product.market_price === product.sales_price) {
+            delete product.market_price;
         } else {
-            product.discount = (product.salesPrice / product.marketPrice * 10).toFixed(1);
+            product.discount = (product.sales_price / product.market_price * 10).toFixed(1);
         }
         // 判别默认的商品是否将默认的图片URL赋值到skn
         let flag = false;
         // 如果设置了默认图片，就取默认的图片
-        _.forEach(product.goodsList, (goods) => {
+        _.forEach(product.goods_list, (goods) => {
             if (flag) {
                 return;
             }
-            if (goods.isDefault === 'Y') {
+            if (goods.is_default === 'Y') {
                 product.defaultImages = procProductImg(goods);
                 flag = true;
             }
@@ -118,39 +119,39 @@ exports.processProductList = (list, options) => {
         // 如果还未赋值，则取第一个skc产品的默认图片
         if (!flag) {
-            product.defaultImages = procProductImg(product.goodsList[0]);
+            product.defaultImages = procProductImg(product.goods_list[0]);
         }
         product = Object.assign(product, {
-            id: product.productSkn,
+            id: product.product_skn,
             thumb: product.defaultImages
         });
-        product.isSoonSoldOut = product.isSoonSoldOut === 'Y';
-        product.url = helpers.urlFormat(`/product/pro_${product.productId}_${product.goodsList[0].goodsId}/${product.cnAlphabet}.html`); // eslint-disable-line
+        product.isSoonSoldOut = product.is_soon_sold_out === 'Y';
+        product.url = helpers.urlFormat(`/product/pro_${product.product_id}_${product.goods_list[0].goods_id}/${product.cn_alphabet}.html`); // eslint-disable-line
         // tar add 1606071146 品牌链接处理
-        product.brandUrl = helpers.urlFormat('', '', product.brandDomain);
+        product.brandUrl = helpers.urlFormat('', '', product.brand_domain);
         // APP访问需要加附加的参数
         // 备注：如果以后APP的接口太多，可以把这边参数提取出来，变成一个公共的方法来生成，便于以后管理维护
         if (options.isApp) {
-            product.url += `?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":'${product.productId}'}}`; // eslint-disable-line
+            product.url += `?openby:yohobuy={"action":"go.productDetail","params":{"product_skn":'${product.product_id}'}}`; // eslint-disable-line
         }
         if (options.showTags) {
             product.tags = {};
-            product.tags.isNew = options.showNew && product.isNew === 'Y'; // 新品
-            product.tags.isDiscount = options.showSale && product.isDiscount === 'Y'; // 在售
-            product.tags.isLimited = product.isLimited === 'Y'; // 限量
-            product.tags.isYohood = product.isYohood === 'Y'; // YOHOOD
-            product.tags.midYear = product.midYear === 'Y'; // 年中
-            product.tags.yearEnd = product.yearEnd === 'Y'; // 年末
-            product.tags.isAdvance = product.isAdvance === 'Y'; // 再到着
+            product.tags.isNew = options.showNew && product.is_new === 'Y'; // 新品
+            product.tags.isDiscount = options.showSale && product.is_discount === 'Y'; // 在售
+            product.tags.isLimited = product.is_limited === 'Y'; // 限量
+            product.tags.isYohood = product.is_yohood === 'Y'; // YOHOOD
+            product.tags.midYear = product.mid_year === 'Y'; // 年中
+            product.tags.yearEnd = product.year_end === 'Y'; // 年末
+            product.tags.isAdvance = product.is_advance === 'Y'; // 再到着
             // 打折与即将售完组合显示打折
-            if (product.isSoonSoldOut && product.tags.isDiscount) {
+            if (product.is_soon_sold_out && product.tags.isDiscount) {
                 product.tags.isFew = false;
             } else if (product.tags.isDiscount &&
                 (product.tags.isFew || product.tags.isLimited || product.tags.isYohood || product.tags.isAdvance)) {