Merge branch 'hotfix/add-cache' into feature/detail-op

# Conflicts:
#	apps/product/models/detail-product-api.js
#	apps/product/models/detail-service.js

@@ -253,9 +253,7 @@ module.exports = class extends global.yoho.BaseModel {
     // 根据small_sort从redis获取分类下的关键词
     // 根据small_sort从redis获取分类下的关键词
     _getRecommendKeywords(smallSort) {
     _getRecommendKeywords(smallSort) {
         return redis.all([['get', `global:yoho:seo:keywords:sortId:${smallSort}:page:1`]]).then(res => {
         return redis.all([['get', `global:yoho:seo:keywords:sortId:${smallSort}:page:1`]]).then(res => {
-            return res[0];
-        }).then(result => {
-            return this._getKeywordsInfo(JSON.parse(result || '[]'));
+            return this._getKeywordsInfo(JSON.parse(res[0] || '[]'));
         });
         });
     }
     }
 
 

@@ -1083,7 +1083,7 @@ function _detailDataPkg(origin, uid, vipLevel, cookies) {
         }
         }
 
 
         // 相关推荐词
         // 相关推荐词
-        requestApi.recommendKeywords = this.productAPI.getRecommendKeywords(result.smallSortId);
+        requestApi.recommendKeywords = this.productAPI.getRecommendKeywords(result.smallSortId, result.skn);
 
 
         // 店铺推荐直出（seo需要）
         // 店铺推荐直出（seo需要）
         requestApi.shopRecommend = this.productAPI.getShopRecommendAsync(result.skn);
         requestApi.shopRecommend = this.productAPI.getShopRecommendAsync(result.skn);