'店铺优惠券获取uid'

@@ -507,7 +507,7 @@ const getBrandCouponsList = (req, res, next) => {
     res.setHeader('Access-Control-Allow-Origin', allowOrigin);
     res.setHeader('Access-Control-Allow-Credentials', 'true');
 
-    let uid = req.user.uid || req.query.uid;
+    let uid = req.user.uid;
     let brandId = parseInt(req.query.brandId, 10);
     let param = {};
 

@@ -255,8 +255,10 @@ const shop = {
                 page: 1
             };
 
-            let goodsListApi = yield searchModel.getShopGoods(searchParam);
-            let couponData = yield couponModel.shopCouponsList({shop_id: shopId});
+            let [goodsListApi, couponData] = yield Promise.all([
+                searchModel.getShopGoods(searchParam),
+                couponModel.shopCouponsList({shop_id: shopId})
+            ]);
             let goodsList = productProcess.processProductList(_.get(goodsListApi, 'data.product_list', []));
 
             if (shopInfo.isShop) {
@@ -326,7 +328,7 @@ const shop = {
         res.setHeader('Access-Control-Allow-Origin', allowOrigin);
         res.setHeader('Access-Control-Allow-Credentials', 'true');
 
-        let uid = req.user.uid || req.query.uid;
+        let uid = req.user.uid;
         let shopId = parseInt(req.query.shopId, 10);
         let param = {};
 
@@ -363,7 +365,7 @@ const shop = {
         }
 
         let cryptCouponId = crypto.decrypt('', req.body.couponID);
-        let uid = req.body.uid || req.user.uid;
+        let uid = req.user.uid;
         let isApp = req.body.app_version || req.body.appVersion || false;
         let data = {};
 

@@ -9,7 +9,6 @@ let shopCoupon = {};
 shopCoupon = {
     common: {
         appVersion: window.queryString.app_version || window.queryString.appVersion,
-        uid: window.queryString.uid,
         shopId: parseInt($('.shop-id').val() || $('.shopId').val(), 10) || null,
         couponTemplate: require('product/shop/coupon.hbs')
     },
@@ -36,8 +35,7 @@ shopCoupon = {
             method: 'GET',
             url: _url,
             data: {
-                shopId: that.common.shopId,
-                uid: that.common.uid
+                shopId: that.common.shopId
             },
             xhrFields: {
                 withCredentials: true