Merge branch 'release/2.0' of git.yoho.cn:fe/yoho-blk into release/2.0

@@ -134,7 +134,13 @@ exports.addToCart = (req, res, next) => {
         shoppingKey: req.cookies._SPK || null,
         uid: req.user.uid
     }).then((result) => {
-        res.cookie('_SPK', result.data.shopping_key, {maxAge: 1000 * 60 * 60 * 24 * 365, httpOnly: true, path: '/'});
+        if (result.data && result.data.shopping_key) {
+            res.cookie(
+                '_SPK',
+                result.data.shopping_key,
+                {maxAge: 1000 * 60 * 60 * 24 * 365, httpOnly: true, path: '/'}
+            );
+        }
         res.json(result);
     }).catch(next);
 };

@@ -21,7 +21,7 @@ const _ = require('lodash');
 const payments = {
     alipay: 33,
     wechat: 36,
-    alibank: 12
+    alibank: 42
 };
 
 /**