Merge branch 'hotfix/6.6' into 'gray'

Hotfix/6.6



See merge request !1384

@@ -454,17 +454,13 @@ class BuyNowController {
     }
 
     /**
-     * 输入优惠券码使用优惠券
+     * 兑换优惠券
      */
     useCouponCode(req, res, next) {
         co(function* () {
-            let result = yield req.ctx(BuyNowModel).usePromotionCode({
-                uid: req.user.uid,
-                product_sku: req.body.product_sku,
-                sku_type: req.body.sku_type,
-                buy_number: req.body.buy_number,
-                promotion_code: req.body.promotion_code
-            });
+            let result = yield req.ctx(shoppingModel).useCoupon(
+                req.user.uid, req.body.couponCode
+            );
 
             res.json(result);
         })().catch(next);

@@ -267,7 +267,7 @@ class shoppingModel extends global.yoho.BaseModel {
     }
 
     /**
-     * 购物车结算--使用优惠券
+     * 购物车结算--兑换优惠券
      * @param uid int   用户uid
      * @param couponCode string 优惠券代码
      * @return

@@ -20,6 +20,11 @@ module.exports = (limiter, policy) => {
 
         try {
             blacklist = JSON.parse(args[0]);
+        } catch (error) {
+            logger.error(error);
+        }
+
+        try {
             whitelist = JSON.parse(args[1]);
         } catch (error) {
             logger.error(error);