'断码区添加两个参数'

郭成尧
Commit 16e2e307670232c674e021933f0ba6dfacb747de 1 parent 351265d3
Showing 3 changed files with 55 additions and 23 deletions
apps/product/models/outlets-handler.js
apps/product/models/sale-handler.js
apps/product/models/sale.js
--- a/apps/product/models/outlets-handler.js
View file @16e2e30
+++ b/apps/product/models/outlets-handler.js
View file @16e2e30
@@ -185,7 +185,6 @@ exports.handleOutletsBannersData = (origin, params) => {
             dest.limitedBuy.extra.sourceImg = {};
             dest.limitedBuy.extra.sourceImg.href = value.data[0].url;
             dest.limitedBuy.extra.sourceImg.img = value.data[0].src;
-            console.log(value.data[0].src);
         }
         // 处理热销推荐数据
--- a/apps/product/models/sale-handler.js
View file @16e2e30
+++ b/apps/product/models/sale-handler.js
View file @16e2e30
@@ -113,21 +113,21 @@ const handleFilterUrl = (originParam, newParam) => {
     let newParamArray = _.keys(newParam);
     // 判断参数是否已经存在
-    let isExist = !_.isEmpty(_.find(originParamArray, function(o) {
+    let isExist = !_.isEmpty(_.find(originParamArray, function (o) {
         return o === newParamArray[0];
     }));
     if (isExist) {
         tempOriginParam = Object.assign(tempOriginParam, originParam);
-        _.forEach(newParam, function(value, key) {
+        _.forEach(newParam, function (value, key) {
             tempOriginParam[key] = value;
         });
     } else {
         tempOriginParam = Object.assign(tempOriginParam, originParam, newParam);
     }
-    _.forEach(tempOriginParam, function(value, key) {
+    _.forEach(tempOriginParam, function (value, key) {
         dest = dest + key + '=' + value + '&';
     });
@@ -201,16 +201,16 @@ const handleSalebreakingYardsSortData = (origin, params) => {
     if (!_.isEmpty(params.sort)) {
         // 是否有分类筛选参数，如果有
-        _.forEach(params.sort.split(','), function(sortParam) {
-            _.forEach(origin, function(value) {
+        _.forEach(params.sort.split(','), function (sortParam) {
+            _.forEach(origin, function (value) {
                 // 判断是否在这组数据里面
                 if (!_.isEmpty(_.find(value.sort_id.split(','), o => {
-                    return o === sortParam;
-                }))) {
+                        return o === sortParam;
+                    }))) {
                     // 如果在某组数据里面，组合数据退出循环
-                    _.forEach(value.sub, function(subValue) {
+                    _.forEach(value.sub, function (subValue) {
                         let size = {};
                         size.checked =
@@ -225,8 +225,8 @@ const handleSalebreakingYardsSortData = (origin, params) => {
             });
         });
     } else { // 如果没有筛选参数，返回所有分类
-        _.forEach(origin, function(value) {
-            _.forEach(value.sub, function(subValue) {
+        _.forEach(origin, function (value) {
+            _.forEach(value.sub, function (subValue) {
                 let size = {};
                 size.checked = (parseInt(params.size, 10) === parseInt(subValue.size_id, 10)) ? true : false;
@@ -291,7 +291,7 @@ exports.handleSaleFilterData = (origin, params) => {
     if (!_.isEmpty(origin.brand)) {
         let count = 0;
-        _.forEach(origin.brand, function(value) {
+        _.forEach(origin.brand, function (value) {
             let brand = {};
             brand.checked = (parseInt(params.brand, 10) === parseInt(value.id, 10)) ? true : false;
@@ -318,13 +318,13 @@ exports.handleSaleFilterData = (origin, params) => {
     }
     // 来排排序
-    dest.brand.brandsShow = _.sortBy(dest.brand.brandsShow, function(o) {
+    dest.brand.brandsShow = _.sortBy(dest.brand.brandsShow, function (o) {
         return o.index;
     });
     // 处理 价格 筛选数据
     if (!_.isEmpty(origin.priceRange)) {
-        _.forEach(origin.priceRange, function(value, key) {
+        _.forEach(origin.priceRange, function (value, key) {
             let price = {
                 checked: (params.price === key) ? true : false,
                 href: handleFilterUrl(params, {price: key}),
@@ -541,7 +541,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
     leftContent.allSort.list.push(perAllSort);
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         let category = {};
@@ -550,7 +550,7 @@ exports.handleSaleSortData = (origin, params, extra) => {
         category.childList = [];
         category.href = handleFilterUrl(params, {sort: value.relation_parameter.sort});
         category.active = false;
-        _.forEach(value.sub, function(subValue) {
+        _.forEach(value.sub, function (subValue) {
             category.childList.push({
                 name: subValue.category_name,
                 num: subValue.node_count,
@@ -580,7 +580,7 @@ exports.handleSaleActivityData = (origin, channel) => {
     dest.big = [];
     dest.normal = [];
-    _.forEach(origin, function(value, key) {
+    _.forEach(origin, function (value, key) {
         let activity = {};
         activity.link =
@@ -627,9 +627,9 @@ exports.handleSaleBannerData = (origin) => {
     var dest = {};
     dest.list = [];
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         if (value.template_name === 'focus') {
-            _.forEach(value.data, function(subValue) {
+            _.forEach(value.data, function (subValue) {
                 let banner = {};
                 banner.bannerHeight = 450;
@@ -654,9 +654,9 @@ exports.handleSaleBannerSmallData = (origin) => {
     var dest = [];
     let count = 0;
-    _.forEach(origin, function(value) {
+    _.forEach(origin, function (value) {
         if (value.template_name === 'small_pic') {
-            _.forEach(value.data, function(picList) {
+            _.forEach(value.data, function (picList) {
                 if (count++ < 3) {
                     let smallPic = {};
@@ -816,3 +816,24 @@ exports.handleSalePagerData = (total, params) => {
     return dest;
 };
+
+/**
+ * 处理断码区尺码数据，输出整合后的筛选条件
+ * @param origin
+ */
+exports.handleSaleBreakingSizeData = (origin) => {
+    let dest = {};
+
+    dest.breakSize = '';
+    dest.breakSort = '';
+
+    _.forEach(origin, value => {
+        dest.breakSort += value.sort_id;
+
+        _.forEach(value.sub, subValue => {
+            dest.breakSize += subValue.size_id + ',';
+        });
+    });
+    
+    return dest;
+};
--- a/apps/product/models/sale.js
View file @16e2e30
+++ b/apps/product/models/sale.js
View file @16e2e30
@@ -341,9 +341,21 @@ exports.getSalebreakingYardsData = (params, channel) => {
         // 断码区产品筛选需要断码区尺码数据，改为串行处理
         if (result[2].code === 200) {
+            let breakingSizeSort = saleHandler.handleSaleBreakingSizeData(result[2].data);
+            let breakParam = {}; // 为断码区筛选参数存储，为了不影响 params ，否则会导致链接过长
+
             return api.all([
-                saleApi.getSaleGoodsList({channel: channel, saleType: '1', limit: '1'}),
-                saleApi.getSaleGoodsList(params)
+                saleApi.getSaleGoodsList({
+                    channel: channel,
+                    saleType: '1',
+                    limit: '1',
+                    breakSize: breakingSizeSort.breakSize,
+                    breakSort: breakingSizeSort.breakSort
+                }),
+                saleApi.getSaleGoodsList(Object.assign(breakParam, params, {
+                    breakSize: breakingSizeSort.breakSize,
+                    breakSort: breakingSizeSort.breakSort
+                }))
             ]).then(subResult => {
                 // 处理筛选条件数据
                 if (subResult[0].code === 200) {