Merge branch 'master' into feature/real-name

@@ -129,14 +129,14 @@ const isFavShop = (req, res, next) => {
     let shopId = req.body.shopId;
     let shopId = req.body.shopId;
 
 
     if (!uid || !shopId) {
     if (!uid || !shopId) {
-        res.json({
+        return res.json({
             code: 400,
             code: 400,
             message: '未收藏'
             message: '未收藏'
         });
         });
     }
     }
 
 
     fav.getFavStatus(uid, shopId, 'shop').then(result => {
     fav.getFavStatus(uid, shopId, 'shop').then(result => {
-        res.json(result);
+        return res.json(result);
     }).catch(next);
     }).catch(next);
 };
 };