Merge branch 'master' into release/5.2

@@ -47,6 +47,11 @@ passport.use(new LocalStrategy({
     // 国际号码验证取消
     // 国际号码验证取消
     let verifyMobile = area === '86' ? helpers.verifyAreaMobile(area + '-' + username) : true;
     let verifyMobile = area === '86' ? helpers.verifyAreaMobile(area + '-' + username) : true;
 
 
+    // 999 号段为有货专用测试号段
+    if (username.indexOf('999') === 0) {
+        verifyMobile = true;
+    }
+
     if (!verifyEmail && !verifyMobile) {
     if (!verifyEmail && !verifyMobile) {
         logger.info(`【Passport Login】bad account, email:${verifyEmail} mobile:${verifyMobile}`);
         logger.info(`【Passport Login】bad account, email:${verifyEmail} mobile:${verifyMobile}`);
         return done('登录账号格式错误', null);
         return done('登录账号格式错误', null);

@@ -1849,6 +1849,9 @@ let _detailDataPkgAsync = (origin, uid, vipLevel, ua) => {
         }
         }
         dest.id = origin.product_id;
         dest.id = origin.product_id;
         dest.goodsId = origin.goods_id;
         dest.goodsId = origin.goods_id;
+        if (dest.isSecKill === 'Y' && dest.cartInfo.totalNum > 0) {
+            dest.totalNum = 1;
+        }
         return Promise.resolve(dest);
         return Promise.resolve(dest);
     }
     }
 
 

@@ -1916,10 +1916,19 @@ const getSeckillData = (param) => {
 
 
         if (result.data) {
         if (result.data) {
             data = result.data;
             data = result.data;
+            if (data.storageSum > 0) {
+                data.storageSum = 1;
+            }
+            if (data.secKillSku) {
+                _.forEach(data.secKillSku, item => {
+                    if (item.storageNum > 0) {
+                        item.storageNum = 1;
+                    }
+                });
+            }
         } else {
         } else {
             data.status = 0;
             data.status = 0;
         }
         }
-
         return data;
         return data;
     });
     });
 };
 };

@@ -64,7 +64,7 @@ module.exports = {
         udp: { // send by udp
         udp: { // send by udp
             measurement: 'yohobuy_wap_node_log',
             measurement: 'yohobuy_wap_node_log',
             level: 'debug', // logger level
             level: 'debug', // logger level
-            host: 'influxdblog.yohoops.org', // influxdb host
+            host: 'influxdblog.web.yohoops.org', // influxdb host
             port: '4444' // influxdb port
             port: '4444' // influxdb port
         },
         },
         console: {
         console: {
@@ -105,7 +105,7 @@ if (isProduction) {
             open: false,
             open: false,
             url: 'http://123.206.2.55/strategy'
             url: 'http://123.206.2.55/strategy'
         },
         },
-        zookeeperServer: '10.66.1.97:2181'
+        zookeeperServer: 'zookeeper.web.yohoops.org:2181'
     });
     });
 } else if (isTest) {
 } else if (isTest) {
     Object.assign(module.exports, {
     Object.assign(module.exports, {

@@ -39,8 +39,8 @@
     "request-promise": "^3.0.0",
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.3",
     "uuid": "^2.0.3",
-    "yoho-node-lib": "0.1.29",
-    "yoho-zookeeper": "^1.0.3"
+    "yoho-node-lib": "0.1.30",
+    "yoho-zookeeper": "^1.0.4"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "autoprefixer": "^6.3.7",
     "autoprefixer": "^6.3.7",