Merge branch 'refs/heads/hotfix/shop'

@@ -25,10 +25,6 @@ exports.index = (req, res, next) => {
             _.isEmpty(req.query) ? null : req.query));
             _.isEmpty(req.query) ? null : req.query));
     }
     }
 
 
-    if (isNaN(+shopId)) {
-        return res.redirect(301, '/404');
-    }
-
     if (req.xhr && req.query._pjax && shopId) {
     if (req.xhr && req.query._pjax && shopId) {
         return req.ctx(shopModel).getShopGoodsData(shopId, req.yoho.channel, req.query).then(result => {
         return req.ctx(shopModel).getShopGoodsData(shopId, req.yoho.channel, req.query).then(result => {
             Object.assign(result, {
             Object.assign(result, {

@@ -351,6 +351,13 @@ function getShopInfoAsync(domain, channel, params) {
         let data, shopInfo;
         let data, shopInfo;
 
 
         if (shopId) { // 带id访问
         if (shopId) { // 带id访问
+            if (isNaN(+shopId)) {
+                return {
+                    redirect: '/404',
+                    redirectType: 301
+                };
+            }
+
             let result = yield this.api.getShopInfo(shopId);
             let result = yield this.api.getShopInfo(shopId);
 
 
             data = result.data || {};
             data = result.data || {};

 {
 {
   "name": "yohobuy-node",
   "name": "yohobuy-node",
-  "version": "6.9.13",
+  "version": "6.9.14",
   "private": true,
   "private": true,
   "description": "A New Yohobuy Project With Express",
   "description": "A New Yohobuy Project With Express",
   "repository": {
   "repository": {