Merge branch 'ge_student_price' into test

# Conflicts:
#	pom.xml

@@ -244,6 +244,16 @@ public class SearchServiceHelper {
 		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_ISDISCOUNT) && StringUtils.isNotBlank(paramMap.get(ISearchConstans.PARAM_SEARCH_ISDISCOUNT))) {
 			boolFilter.must(FilterBuilders.termFilter("isDiscount", paramMap.get(ISearchConstans.PARAM_SEARCH_ISDISCOUNT)));
 		}
+		
+		// 是否为学生价
+		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_STUDENTPRICE) && StringUtils.isNotBlank(paramMap.get(ISearchConstans.PARAM_SEARCH_STUDENTPRICE))) {
+			boolFilter.must(FilterBuilders.termFilter(ISearchConstans.PARAM_SEARCH_STUDENTPRICE, paramMap.get(ISearchConstans.PARAM_SEARCH_STUDENTPRICE)));
+		}
+		
+		// 是否支持分期
+		if (paramMap.containsKey(ISearchConstans.PARAM_SEARCH_ISINSTALMENT) && StringUtils.isNotBlank(paramMap.get(ISearchConstans.PARAM_SEARCH_ISINSTALMENT))) {
+			boolFilter.must(FilterBuilders.termFilter(ISearchConstans.PARAM_SEARCH_ISINSTALMENT, paramMap.get(ISearchConstans.PARAM_SEARCH_ISINSTALMENT)));
+		}
 
 		// 属性（待研究）
 		if (!"parameter".equals(filterParamName)) {
@@ -521,6 +531,9 @@ public class SearchServiceHelper {
 		productMap.put("is_promotion", map.get("ispromotion"));
 		productMap.put("yohood_id", map.get("yohoodId"));
 		productMap.put("sales_phrase", map.get("salesPhrase"));
+		productMap.put("student_price", map.get("studentPrice"));
+		productMap.put("is_student_price", map.get("isStudentPrice"));
+		productMap.put("countryId", map.get("countryId"));
 
 		// 是否是全球购商品
 		productMap.put("is_global", map.get("isGlobal") == null ? "N" : map.get("isGlobal"));