Merge branch 'feature/individuation' into feature/download_individate

 'use strict';
 'use strict';
 const model = require('../models/individuation');
 const model = require('../models/individuation');
+const channels = {
+    boys: 1,
+    girl: 2,
+    kids: 3,
+    lifestyle: 4
+};
 
 
 exports.productLst = function(req, res, next) {
 exports.productLst = function(req, res, next) {
     let keys = ['sort', 'misort', 'msort', 'gender', 'brand'],
     let keys = ['sort', 'misort', 'msort', 'gender', 'brand'],
@@ -8,7 +14,9 @@ exports.productLst = function(req, res, next) {
             uid: req.query.uid,
             uid: req.query.uid,
             udid: req.query.udid,
             udid: req.query.udid,
             promotion: req.query.pid,
             promotion: req.query.pid,
+            yh_channel: req.query.yh_channel || (req.cookies._Channel && channels[req.cookies._Channel]) || 1,
             specified_sort: req.query.enum,
             specified_sort: req.query.enum,
+            stocknumber: req.query.sn,
             p_d: req.query.pd,
             p_d: req.query.pd,
             limit: req.query.limit || 10
             limit: req.query.limit || 10
         };
         };

@@ -11,6 +11,8 @@ let _getProduct = function(o) {
         middle_sort_id: o.middle_sort_id,
         middle_sort_id: o.middle_sort_id,
         max_sort_id: o.max_sort_id,
         max_sort_id: o.max_sort_id,
         brand_id: o.brand_id,
         brand_id: o.brand_id,
+        shop_id: o.shop_id,
+        shop_template_type: o.shop_template_type,
         brand_domain: o.brand_domain,
         brand_domain: o.brand_domain,
         brand_name: o.brand_name,
         brand_name: o.brand_name,
         product_id: o.product_id,
         product_id: o.product_id,
@@ -20,7 +22,7 @@ let _getProduct = function(o) {
         sales_price: o.sales_price,
         sales_price: o.sales_price,
         cn_alphabet: o.cn_alphabet,
         cn_alphabet: o.cn_alphabet,
         default_images: o.default_images,
         default_images: o.default_images,
-        goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : ''
+        goods_id: Array.isArray(o.goods_list) && o.goods_list.length ? o.goods_list[0].goods_id : undefined
     };
     };
 };
 };