Merge branch 'hotfix/submit'

@@ -66,10 +66,10 @@ const submit = (req, res, next) => {
     let uid = req.user.uid;
     let uid = req.user.uid;
     let remoteIp = req.ip;
     let remoteIp = req.ip;
 
 
-    if (!req.body.addressId) {
+    if (!req.body.addressId || !req.body.paymentType || !req.body.deliveryWay) {
         res.send({
         res.send({
             code: 500,
             code: 500,
-            message: '配送地址不能为空'
+            message: '订单参数不完整'
         });
         });
         return;
         return;
     }
     }

@@ -6,7 +6,7 @@
 'use strict';
 'use strict';
 
 
 const _ = require('lodash');
 const _ = require('lodash');
-const pinyin = require('pinyin');
+const pinyin = require('pinyin-converter');
 
 
 const crypto = global.yoho.crypto;
 const crypto = global.yoho.crypto;
 
 

@@ -29,7 +29,7 @@ module.exports = (limiter, policy) => {
 
 
     const key = `pc:limiter:${limiter.remoteIp}`;
     const key = `pc:limiter:${limiter.remoteIp}`;
 
 
-    let isNew = false;
+    let isNew = true;
 
 
     res.on('render', function() {
     res.on('render', function() {
         let route = req.route ? req.route.path : '';
         let route = req.route ? req.route.path : '';
@@ -53,9 +53,8 @@ module.exports = (limiter, policy) => {
 
 
     return cache.getAsync(key).then((result) => {
     return cache.getAsync(key).then((result) => {
         logger.debug('qps limiter: ' + key + '@' + result + ' max: ' + MAX_QPS);
         logger.debug('qps limiter: ' + key + '@' + result + ' max: ' + MAX_QPS);
-
         if (result && _.isNumber(result)) {
         if (result && _.isNumber(result)) {
-
+            isNew = false;
             if (result === -1) {
             if (result === -1) {
                 return Promise.resolve(true);
                 return Promise.resolve(true);
             }
             }
@@ -72,7 +71,6 @@ module.exports = (limiter, policy) => {
             }
             }
         } else {
         } else {
             cache.setAsync(key, 1, 60);  // 设置key，1m失效
             cache.setAsync(key, 1, 60);  // 设置key，1m失效
-            isNew = true;
             return Promise.resolve(true);
             return Promise.resolve(true);
         }
         }
     });
     });

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "5.4.13",
+  "version": "5.4.14",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {
@@ -56,7 +56,7 @@
     "passport-sina": "^0.1.0",
     "passport-sina": "^0.1.0",
     "passport-strategy": "1.x.x",
     "passport-strategy": "1.x.x",
     "passport-weixin": "^0.1.0",
     "passport-weixin": "^0.1.0",
-    "pinyin": "^2.8.0",
+    "pinyin-converter": "^2.8.1",
     "request-ip": "^1.2.2",
     "request-ip": "^1.2.2",
     "request-promise": "^3.0.0",
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "serve-favicon": "^2.3.0",

@@ -127,6 +127,29 @@ function compute(coin, cb) {
     });
     });
 }
 }
 
 
+function validateOrderInfo(info) {
+    var errTip = '';
+
+    if (!errTip && !info.addressId) {
+        errTip = '请填写配送地址';
+    }
+
+    if (!errTip && !info.paymentType) {
+        errTip = '请选择支付方式';
+    }
+
+    if (!errTip && !info.deliveryWay) {
+        errTip = '请选择配送方式';
+    }
+
+    if (errTip) {
+        new dialog.Alert(errTip).show();
+        return false;
+    }
+
+    return true;
+}
+
 // 支付方式
 // 支付方式
 payWay = {
 payWay = {
     $allType: $('.pay-wrap > p'),
     $allType: $('.pay-wrap > p'),
@@ -167,7 +190,7 @@ payWay = {
             $this.addClass('checked');
             $this.addClass('checked');
 
 
             // 更新订单支付数据
             // 更新订单支付数据
-            that.updateOrder($this.data());
+            that.updateOrder(pt);
 
 
             // 重新计算订单价格
             // 重新计算订单价格
             compute();
             compute();
@@ -230,11 +253,11 @@ payWay = {
             return;
             return;
         }
         }
 
 
-        if (info.id) {
+        if (info.hasOwnProperty('id')) {
             order.paymentId = info.id;
             order.paymentId = info.id;
         }
         }
 
 
-        if (info.type) {
+        if (info.hasOwnProperty('type')) {
             order.paymentType = info.type;
             order.paymentType = info.type;
         }
         }
     }
     }
@@ -692,6 +715,11 @@ $('#order-submit').click(function() {
         $.extend(order, invoiceInfo);
         $.extend(order, invoiceInfo);
     }
     }
 
 
+    // 订单参数校验
+    if (!validateOrderInfo(order)) {
+        return;
+    }
+
     $.ajax({
     $.ajax({
         type: 'POST',
         type: 'POST',
         url: '/cart/ensure/submit',
         url: '/cart/ensure/submit',