api-get-params-add

@@ -285,17 +285,29 @@ exports.selectCoupon = (req, res) => {
  * 购物车结算--获取优惠券列表
  */
 exports.couponList = (req, res, next) => {
-    let uid = req.user.uid;
+    let orderInfo;
+
+    try {
+        orderInfo = JSON.parse(req.cookies['order-info']);
+    } catch (e) {
+        logger.info(`orderEnsure: get orderInfo from cookie error:${JSON.stringify(e)}`);
+        orderInfo = {};
+        res.clearCookie('order-info', actCkOpthn);
+    }
+
+    let delivery_way = orderInfo.deliveryId || 1;
 
     if (req.xhr) {
-        return cartModel.getCouponList(uid)
-            .then(data => {
-                res.json(data);
-            }).catch(next);
+        return cartModel.getCouponList({
+            uid: req.user.uid,
+            delivery_way: delivery_way,
+            is_group_frees: 'Y' // 运费券是否分组
+        }).then(data => {
+            res.json(data);
+        }).catch(next);
     } else {
         return next();
     }
-
 };
 
 /**

@@ -247,36 +247,37 @@ exports.orderSub = (uid, addressId, cartType, deliveryTime,
  * @param int $uid 用户ID
  * @return array|mixed 处理之后的优惠券数据
  */
-exports.getCouponList = uid => {
+exports.getCouponList = params => {
     let result = {
         availableCoupons: [],
         usableFreesCoupons: [],
         notAvailableCoupons: [],
     };
 
-    return shoppingAPI.listCoupon(uid)
-        .then(coupons => {
-            let usableCoupons = _.get(coupons, 'data.usable_coupons', []);
-            let freesCoupons = _.get(coupons, 'usable_frees_coupons', []);
-            let unusableCoupons = _.get(coupons, 'data.unusable_coupons', []);
-
-            let procCouponsData = coupon => {
-                return {
-                    couponCode: coupon.coupon_code,
-                    couponDetailInfomation: coupon.coupon_name,
-                    couponValue: coupon.coupon_value,
-                    couponValidity: coupon.coupon_validity
-                };
+    return shoppingAPI.listCoupon({
+        uid: params.uid,
+        delivery_way: params.delivery_way,
+        is_group_frees: params.is_group_frees
+    }).then(coupons => {
+        let usableCoupons = _.get(coupons, 'data.usable_coupons', []);
+        let freesCoupons = _.get(coupons, 'usable_frees_coupons', []);
+        let unusableCoupons = _.get(coupons, 'data.unusable_coupons', []);
+
+        let procCouponsData = coupon => {
+            return {
+                couponCode: coupon.coupon_code,
+                couponDetailInfomation: coupon.coupon_name,
+                couponValue: coupon.coupon_value,
+                couponValidity: coupon.coupon_validity
             };
+        };
 
-            result.availableCoupons = usableCoupons.map(procCouponsData); // 可用优惠券
-            result.usableFreesCoupons = freesCoupons.map(procCouponsData); // 运费券
-            result.notAvailableCoupons = unusableCoupons.map(procCouponsData); // 不可用优惠券
+        result.availableCoupons = usableCoupons.map(procCouponsData); // 可用优惠券
+        result.usableFreesCoupons = freesCoupons.map(procCouponsData); // 运费券
+        result.notAvailableCoupons = unusableCoupons.map(procCouponsData); // 不可用优惠券
 
-            return result;
-        },
-            () => result
-        );
+        return result;
+    });
 };
 
 exports.useCouponCode = (uid, couponCode) => {

@@ -260,10 +260,12 @@ exports.getValidCouponCount = uid => {
  *  @param uid int 用户uid
  *  @return see doc
  */
-exports.listCoupon = uid => {
+exports.listCoupon = params => {
     let param = {
         method: 'app.Shopping.listCoupon',
-        uid
+        uid: params.uid,
+        delivery_way: params.delivery_way,
+        is_group_frees: params.is_group_frees
     };
 
     return api.get('', param);