Merge branch 'hotfix/orderensure' into 'master'

address-id-nan



See merge request !796

@@ -161,7 +161,7 @@ class BuyNowController {
             sku_type: req.body.sku_type,
             sku_type: req.body.sku_type,
             buy_number: req.body.buy_number,
             buy_number: req.body.buy_number,
             coupon_code: req.body.coupon_code,
             coupon_code: req.body.coupon_code,
-            address_id: parseInt(crypto.decrypt('', req.body.address_id), 10),
+            address_id: parseInt(crypto.decrypt('', req.body.address_id), 10) || 0,
             delivery_time: req.body.delivery_time,
             delivery_time: req.body.delivery_time,
             delivery_way: req.body.delivery_way,
             delivery_way: req.body.delivery_way,
             use_yoho_coin: req.body.use_yoho_coin,
             use_yoho_coin: req.body.use_yoho_coin,

@@ -101,6 +101,18 @@ class BuyNowModel extends global.yoho.BaseModel {
      * @param {*} params
      * @param {*} params
      */
      */
     submit(params) {
     submit(params) {
+        if (!params.address_id) {
+            return Promise.resolve({ code: 401, message: '配送地址不能为空' });
+        }
+
+        if (!params.delivery_time) {
+            return Promise.resolve({ code: 402, message: '请选择配送时间' });
+        }
+
+        if (!params.delivery_way) {
+            return Promise.resolve({ code: 403, message: '请选择配送方式' });
+        }
+
         let finalParams = {
         let finalParams = {
             method: 'app.Buynow.submit',
             method: 'app.Buynow.submit',
             uid: params.uid,
             uid: params.uid,