goods列表抽离

+package com.yoho.search.service.helper;
+
+import com.yoho.search.base.utils.ProductIndexEsField;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
+import org.apache.commons.lang.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangnan
+ * @version 2018/5/31
+ */
+@Component
+public class GoodsCoverHelper {
+
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    public void buildGoodsCover(Map<String, Object> map, Map<String, Object> productMap) {
+        try {
+            List<HashMap<String, Object>> goodsList = (List<HashMap<String, Object>>) MapUtils.getObject(map, ProductIndexEsField.goodsList, new ArrayList<>());
+            if (CollectionUtils.isEmpty(goodsList)) {
+                return;
+            }
+            //默认用第一个
+            HashMap<String, Object> firstGoods = goodsList.get(0);
+            String imagesUrl = MapUtils.getString(firstGoods, "images_url");
+            String cover1 = MapUtils.getString(firstGoods, "cover_1");
+            String cover2 = MapUtils.getString(firstGoods, "cover_2");
+            for (HashMap<String, Object> goodsMap : goodsList) {
+                //  如果此skc是默认的,用这个默认的
+                if ("Y".equals(MapUtils.getString(goodsMap, "is_default"))) {
+                    imagesUrl = MapUtils.getString(goodsMap, "images_url");
+                    cover1 = MapUtils.getString(goodsMap, "cover_1");
+                    cover2 = MapUtils.getString(goodsMap, "cover_2");
+                }
+            }
+            cover1 = StringUtils.isNotBlank(cover1) ? cover1 : imagesUrl;
+            cover2 = StringUtils.isNotBlank(cover2) ? cover2 : imagesUrl;
+            productMap.put("cover_1", cover1);
+            productMap.put("cover_2", cover2);
+        } catch (Exception e) {
+            logger.error(e.getMessage(), e);
+            productMap.put("cover_1", "");
+            productMap.put("cover_2", "");
+        }
+    }
+
+
+}

-package com.yoho.search.service.helper;
-
-import com.yoho.search.base.utils.ProductIndexEsField;
-import com.yoho.search.common.utils.ImageUrlAssist;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author wangnan
- * @version 2018/5/31
- */
-@Component
-public class SknDefaultImagesHelper {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    public String buildDefaultImages(Map<String, Object> map) {
-        String defaultImages = MapUtils.getString(map, ProductIndexEsField.defaultImages, "");
-        try {
-            String productGender = MapUtils.getString(map, ProductIndexEsField.gender, "");
-            List<HashMap<String, Object>> goodsList = (List<HashMap<String, Object>>) MapUtils.getObject(map, ProductIndexEsField.goodsList, new ArrayList<>());
-            if (CollectionUtils.isEmpty(goodsList)) {
-                return defaultImages;
-            }
-            HashMap<String, Object> firstGood = new HashMap<>(1);
-            boolean useFirstGoods = true;
-            for (int i = 0; i < goodsList.size(); i++) {
-                HashMap<String, Object> goodsMap = goodsList.get(i);
-                // 有可能，goodsList中的所有good都没有cover1或者cover2，最终就采用第一个good
-                if (i == 0 && StringUtils.isNotEmpty(MapUtils.getString(goodsMap, "images_url"))) {
-                    firstGood = goodsMap;
-                }
-                //  此skc是默认的，则将图片赋值给skn
-                if ("Y".equals(MapUtils.getString(goodsMap, "is_default"))) {
-                    defaultImages = getDefaultImages(goodsMap, productGender);
-                    useFirstGoods = false;
-                }
-            }
-            // 如果还未赋值，则取第一个skc产品的默认图片
-            if (useFirstGoods) {
-                defaultImages = getDefaultImages(firstGood, productGender);
-            }
-            if (StringUtils.isNotBlank(defaultImages) && !defaultImages.startsWith("http://")) {
-                defaultImages = ImageUrlAssist.getAllProductPicUrl(defaultImages, "goodsimg", "center", "d2hpdGU=");
-            }
-            return defaultImages;
-        } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-        }
-        return defaultImages;
-    }
-
-    /**
-     * 男生频道进入：
-     * 筛选条件为男，展示男士商品和通用款，有男封的优先显示男封，没有男封，显示默认单品图。
-     * 筛选条件为女，展示女士商品和通用款，有女封的优先显示女封，没有女封，显示默认单品图。
-     * 筛选条件为男女，展示男/女商品和通用款，优先显示封面图，商品是男则显示男封，商品是女则显示女封，没有封面图，显示默认单品图。如果是通用款男封女封都有，优先显示男封，如果没有封面图，显示默认单品图。
-     * 女生频道进入：
-     * 筛选条件为男，展示男士商品和通用款，有男封的优先显示男封，没有男封，显示默认单品图。
-     * 筛选条件为女，展示女士商品和通用款，有女封的优先显示女封，没有女封，显示默认单品图。
-     * 筛选条件为男女，展示男/女商品和通用款，优先显示封面图，没有封面图，显示默认单品图。如果是通用款男封女封都有，优先显示女封。
-     * 潮童、创意生活频道进入：
-     * 筛选条件为男，展示男士商品和通用款，有男封的优先显示男封，没有男封，显示默认单品图。
-     * 筛选条件为女，展示女士商品和通用款，有女封的优先显示女封，没有女封，显示默认单品图。
-     * 筛选条件为男女，展示男/女商品和通用款，优先显示封面图，没有封面图，显示默认单品图。如果是通用款男封女封都有，优先显示男封。
-     */
-    private String getDefaultImages(HashMap<String, Object> goodsMap, String productGender) {
-        String images_url = ImageUrlAssist.getAllProductPicUrl(MapUtils.getString(goodsMap, "images_url"), "goodsimg", "center", "d2hpdGU=");
-        String conver_1 = ImageUrlAssist.getAllProductPicUrl(MapUtils.getString(goodsMap, "cover_1"), "goodsimg", "center", "d2hpdGU=");
-        String conver_2 = ImageUrlAssist.getAllProductPicUrl(MapUtils.getString(goodsMap, "cover_2"), "goodsimg", "center", "d2hpdGU=");
-        if ("1".equals(productGender)) {
-            return StringUtils.isNotBlank(conver_1) ? conver_1 : images_url;
-        } else if ("2".equals(productGender)) {
-            return StringUtils.isNotBlank(conver_2) ? conver_2 : images_url;
-        } else {
-            return images_url;
-        }
-    }
-
-}

@@ -2,7 +2,7 @@ package com.yoho.search.service.index;
 
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONArray;
 import com.yoho.search.base.utils.ProductIndexEsField;
 import com.yoho.search.base.utils.ProductIndexEsField;
-import com.yoho.search.service.helper.SknDefaultImagesHelper;
+import com.yoho.search.service.helper.GoodsCoverHelper;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
@@ -22,7 +22,7 @@ public class ProductIndexBaseService {
     private static final Logger logger = LoggerFactory.getLogger(ProductIndexBaseService.class);
     private static final Logger logger = LoggerFactory.getLogger(ProductIndexBaseService.class);
 
 
     @Autowired
     @Autowired
-    private SknDefaultImagesHelper sknDefaultImagesHelper;
+    private GoodsCoverHelper goodsCoverHelper;
 
 
 
 
     // 获取从source中不返回的字段定义,用以节省带宽
     // 获取从source中不返回的字段定义,用以节省带宽
@@ -142,8 +142,9 @@ public class ProductIndexBaseService {
         productMap.put("student_price", "Y".equalsIgnoreCase(isStudentPrice) ? MapUtils.getDoubleValue(map, ProductIndexEsField.studentPrice) : null);
         productMap.put("student_price", "Y".equalsIgnoreCase(isStudentPrice) ? MapUtils.getDoubleValue(map, ProductIndexEsField.studentPrice) : null);
         productMap.put("is_student_rebate", MapUtils.getString(map, ProductIndexEsField.isstudentrebate, "N"));
         productMap.put("is_student_rebate", MapUtils.getString(map, ProductIndexEsField.isstudentrebate, "N"));
 
 
-        // 把gateway逻辑抽过来，用goodsList直接生成default_images
-        productMap.put("default_images", sknDefaultImagesHelper.buildDefaultImages(map));
+        // 把gateway逻辑抽过来，抽取cover1,cover2
+        goodsCoverHelper.buildGoodsCover(map, productMap);
+        productMap.put("default_images", MapUtils.getString(map, ProductIndexEsField.defaultImages, ""));
         productMap.put("skn_default_img", MapUtils.getString(map, ProductIndexEsField.sknDefaultImg, ""));
         productMap.put("skn_default_img", MapUtils.getString(map, ProductIndexEsField.sknDefaultImg, ""));
 
 
         productMap.put("edit_time", MapUtils.getIntValue(map, ProductIndexEsField.editTime));
         productMap.put("edit_time", MapUtils.getIntValue(map, ProductIndexEsField.editTime));