先不限是否是全球购商品

@@ -365,10 +365,10 @@ public class SearchServiceHelper {
 			boolFilter.must(FilterBuilders.termsFilter("productSkn", sknString.split(",")));
 			boolFilter.must(FilterBuilders.termsFilter("productSkn", sknString.split(",")));
 		}
 		}
 
 
-		// 如果contain_global！=Y，则过滤掉全球购的商品[全球购商品融合需求]
-		if (!paramMap.containsKey("contain_global") ||  !"Y".equals(paramMap.get("contain_global"))) {
-			boolFilter.must(FilterBuilders.termsFilter("isGlobal", "N"));
-		}
+//		// 如果contain_global！=Y，则过滤掉全球购的商品[全球购商品融合需求]
+//		if (!paramMap.containsKey("contain_global") || !"Y".equals(paramMap.get("contain_global"))) {
+//			boolFilter.must(FilterBuilders.termsFilter("isGlobal", "N"));
+//		}
 
 
 		// 通用的过滤请求
 		// 通用的过滤请求
 		for (String key : paramMap.keySet()) {
 		for (String key : paramMap.keySet()) {
@@ -453,17 +453,8 @@ public class SearchServiceHelper {
 		productMap.put("yohood_id", map.get("yohoodId"));
 		productMap.put("yohood_id", map.get("yohoodId"));
 		productMap.put("sales_phrase", map.get("salesPhrase"));
 		productMap.put("sales_phrase", map.get("salesPhrase"));
 		
 		
-		//测试用
-		String isGlobal = "N";
-		try {
-			Integer productSkn = (Integer) map.get("productSkn");
-			if(productSkn!=null && productSkn%2==0){
-				isGlobal = "Y";
-			}
-		} catch (Exception e) {
-			// TODO: handle exception
-		}
-		productMap.put("is_global",isGlobal);
+		// 是否是全球购商品
+		productMap.put("is_global", map.get("isGlobal") == null ? "N" : map.get("isGlobal"));
 		
 		
 		return productMap;
 		return productMap;
 	}
 	}