Authored by 胡古飞

return bundleType

@@ -721,7 +721,7 @@ public class SearchServiceHelper { @@ -721,7 +721,7 @@ public class SearchServiceHelper {
721 productMap.put("stock_number", map.getOrDefault(ProductIndexEsField.storageNum, 0)); 721 productMap.put("stock_number", map.getOrDefault(ProductIndexEsField.storageNum, 0));
722 productMap.put("storage_num", map.getOrDefault(ProductIndexEsField.storageNum, 0)); 722 productMap.put("storage_num", map.getOrDefault(ProductIndexEsField.storageNum, 0));
723 productMap.put("sales_num", map.getOrDefault(ProductIndexEsField.salesNum, 0)); 723 productMap.put("sales_num", map.getOrDefault(ProductIndexEsField.salesNum, 0));
724 - 724 +
725 productMap.put("gender", map.get(ProductIndexEsField.gender)); 725 productMap.put("gender", map.get(ProductIndexEsField.gender));
726 productMap.put("age_level", map.getOrDefault(ProductIndexEsField.ageLevel, ""));// 年龄层,逗号隔开的字符串 726 productMap.put("age_level", map.getOrDefault(ProductIndexEsField.ageLevel, ""));// 年龄层,逗号隔开的字符串
727 productMap.put("sales_phrase", map.getOrDefault(ProductIndexEsField.salesPhrase, "")); 727 productMap.put("sales_phrase", map.getOrDefault(ProductIndexEsField.salesPhrase, ""));
@@ -739,20 +739,18 @@ public class SearchServiceHelper { @@ -739,20 +739,18 @@ public class SearchServiceHelper {
739 productMap.put("is_discount", map.getOrDefault(ProductIndexEsField.isDiscount, "N")); 739 productMap.put("is_discount", map.getOrDefault(ProductIndexEsField.isDiscount, "N"));
740 productMap.put("is_soon_sold_out", map.getOrDefault(ProductIndexEsField.isSoonSoldOut, "N")); 740 productMap.put("is_soon_sold_out", map.getOrDefault(ProductIndexEsField.isSoonSoldOut, "N"));
741 productMap.put("is_promotion", map.getOrDefault(ProductIndexEsField.ispromotion, 0)); 741 productMap.put("is_promotion", map.getOrDefault(ProductIndexEsField.ispromotion, 0));
742 - 742 +
  743 + productMap.put("bundle_type", map.getOrDefault(ProductIndexEsField.bundleType, 0));
  744 +
743 // yohoodId 745 // yohoodId
744 String yohoodId = (String) map.getOrDefault(ProductIndexEsField.yohoodId, ""); 746 String yohoodId = (String) map.getOrDefault(ProductIndexEsField.yohoodId, "");
745 productMap.put("yohood_id", StringUtils.isNotBlank(yohoodId) ? yohoodId : null); 747 productMap.put("yohood_id", StringUtils.isNotBlank(yohoodId) ? yohoodId : null);
746 748
747 // 学生价和学生返币 749 // 学生价和学生返币
748 - productMap.put("is_student_rebate", map.getOrDefault(ProductIndexEsField.isstudentrebate, "N"));  
749 - String isStudentPrice = (String) map.get(ProductIndexEsField.isStudentPrice); 750 + String isStudentPrice = (String) map.getOrDefault(ProductIndexEsField.isStudentPrice,"N");
750 productMap.put("is_student_price", isStudentPrice); 751 productMap.put("is_student_price", isStudentPrice);
751 - if (isStudentPrice == null || isStudentPrice.equalsIgnoreCase("N")) {  
752 - productMap.put("student_price", null);  
753 - } else {  
754 - productMap.put("student_price", map.get(ProductIndexEsField.studentPrice));  
755 - } 752 + productMap.put("student_price", "Y".equalsIgnoreCase(isStudentPrice)?map.get(ProductIndexEsField.studentPrice):null);
  753 + productMap.put("is_student_rebate", map.getOrDefault(ProductIndexEsField.isstudentrebate, "N"));
756 754
757 // 全球购相关 755 // 全球购相关
758 productMap.put("is_global", map.getOrDefault(ProductIndexEsField.isGlobal, "N")); 756 productMap.put("is_global", map.getOrDefault(ProductIndexEsField.isGlobal, "N"));