yoho-search / yoho-search-service · Commits

Go to a project

Authored by unknown
Commit 53a93e1c9ab7cb04d668c35746e82a9b34903d94 1 parent a6934a9c

优惠券列表不支持定金预售和定金促销

Inline Side-by-side
Showing 3 changed files with 14 additions and 12 deletions
@@ -40,6 +40,7 @@ public class SearchRequestParams { @@ -40,6 +40,7 @@ public class SearchRequestParams {
40 public static final String PARAM_SEARCH_ISLIMITEDBUY = "isLimitbuy"; // 查询是否限购 40 public static final String PARAM_SEARCH_ISLIMITEDBUY = "isLimitbuy"; // 查询是否限购
41 public static final String PARAM_SEARCH_ISADVANCE = "isAdvance"; // 查询是否预售 41 public static final String PARAM_SEARCH_ISADVANCE = "isAdvance"; // 查询是否预售
42 public static final String PARAM_SEARCH_ISDESPOSITADVANCE = "isDepositAdvance"; // 查询是否定金预售 42 public static final String PARAM_SEARCH_ISDESPOSITADVANCE = "isDepositAdvance"; // 查询是否定金预售
  43 + public static final String PARAM_SEARCH_ISLIMITTIMEADVANCE = "isLimitTimeAdvance"; // 查询是否定金促销
43 44
44 public static final String PARAM_SEARCH_BUNDLETYPE = "bundleType"; // 售卖类型 45 public static final String PARAM_SEARCH_BUNDLETYPE = "bundleType"; // 售卖类型
45 46
@@ -273,6 +273,10 @@ public class SearchServiceHelper { @@ -273,6 +273,10 @@ public class SearchServiceHelper {
273 if (this.checkParamNotFiltered(paramMap, filterParamName, SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE)) { 273 if (this.checkParamNotFiltered(paramMap, filterParamName, SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE)) {
274 boolFilter.must(QueryBuilders.termQuery(ProductIndexEsField.isDepositAdvance, paramMap.get(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE))); 274 boolFilter.must(QueryBuilders.termQuery(ProductIndexEsField.isDepositAdvance, paramMap.get(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE)));
275 } 275 }
  276 + // 是否定金促销
  277 + if (this.checkParamNotFiltered(paramMap, filterParamName, SearchRequestParams.PARAM_SEARCH_ISLIMITTIMEADVANCE)) {
  278 + boolFilter.must(QueryBuilders.termQuery(ProductIndexEsField.isLimitTimeAdvance, paramMap.get(SearchRequestParams.PARAM_SEARCH_ISLIMITTIMEADVANCE)));
  279 + }
276 // 是否新品 280 // 是否新品
277 if (this.checkParamNotFiltered(paramMap, filterParamName, SearchRequestParams.PARAM_SEARCH_ISNEW)) { 281 if (this.checkParamNotFiltered(paramMap, filterParamName, SearchRequestParams.PARAM_SEARCH_ISNEW)) {
278 boolFilter.must(QueryBuilders.termQuery(ProductIndexEsField.isnew, paramMap.get(SearchRequestParams.PARAM_SEARCH_ISNEW))); 282 boolFilter.must(QueryBuilders.termQuery(ProductIndexEsField.isnew, paramMap.get(SearchRequestParams.PARAM_SEARCH_ISNEW)));
@@ -450,15 +454,14 @@ public class SearchServiceHelper { @@ -450,15 +454,14 @@ public class SearchServiceHelper {
450 // 活动模板相关的过滤条件 454 // 活动模板相关的过滤条件
451 BoolQueryBuilder activitiesTermsBuilder = searchCommonHelper.getActivitiesTermsBuilder(paramMap); 455 BoolQueryBuilder activitiesTermsBuilder = searchCommonHelper.getActivitiesTermsBuilder(paramMap);
452 if (activitiesTermsBuilder != null) { 456 if (activitiesTermsBuilder != null) {
453 - boolFilter.must(QueryBuilders.nestedQuery(ProductIndexEsField.activities, activitiesTermsBuilder,ScoreMode.None)); 457 + boolFilter.must(QueryBuilders.nestedQuery(ProductIndexEsField.activities, activitiesTermsBuilder, ScoreMode.None));
454 } 458 }
455 459
456 -  
457 - //自定义标签  
458 - BoolQueryBuilder customizeTagsTermsBuilder = searchCommonHelper.getCustomizeTagBuilder(paramMap);  
459 - if (customizeTagsTermsBuilder != null) {  
460 - boolFilter.must(QueryBuilders.nestedQuery(ProductIndexEsField.customizeTags, customizeTagsTermsBuilder,ScoreMode.None));  
461 - } 460 + // 自定义标签
  461 + BoolQueryBuilder customizeTagsTermsBuilder = searchCommonHelper.getCustomizeTagBuilder(paramMap);
  462 + if (customizeTagsTermsBuilder != null) {
  463 + boolFilter.must(QueryBuilders.nestedQuery(ProductIndexEsField.customizeTags, customizeTagsTermsBuilder, ScoreMode.None));
  464 + }
462 465
463 // 如果contain_seckill！=Y，则过滤掉秒杀商品 466 // 如果contain_seckill！=Y，则过滤掉秒杀商品
464 if (!paramMap.containsKey(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL) || !"Y".equals(paramMap.get(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL))) { 467 if (!paramMap.containsKey(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL) || !"Y".equals(paramMap.get(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL))) {
@@ -490,8 +493,6 @@ public class SearchServiceHelper { @@ -490,8 +493,6 @@ public class SearchServiceHelper {
490 boolFilter.mustNot(QueryBuilders.termsQuery(ProductIndexEsField.shopId, paramMap.get(SearchRequestParams.PARAM_SEARCH_NOT_SHOP_ID).split(","))); 493 boolFilter.mustNot(QueryBuilders.termsQuery(ProductIndexEsField.shopId, paramMap.get(SearchRequestParams.PARAM_SEARCH_NOT_SHOP_ID).split(",")));
491 } 494 }
492 495
493 -  
494 -  
495 // // 通用的过滤请求 496 // // 通用的过滤请求
496 // for (String key : paramMap.keySet()) { 497 // for (String key : paramMap.keySet()) {
497 // if (key.startsWith("not_")) { 498 // if (key.startsWith("not_")) {
@@ -36,12 +36,12 @@ public class CouponSceneService extends AbstractSceneService { @@ -36,12 +36,12 @@ public class CouponSceneService extends AbstractSceneService {
36 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITED, "N");// 不支持限定 36 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITED, "N");// 不支持限定
37 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL, "N");// 不支持秒杀 37 paramMap.put(SearchRequestParams.PARAM_SEARCH_CONTAIN_SECKILL, "N");// 不支持秒杀
38 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISADVANCE, "N");// 不支持预售 38 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISADVANCE, "N");// 不支持预售
39 - paramMap.put(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE, "N");// 不支持定金预售  
40 paramMap.put(SearchRequestParams.PARAM_SEARCH_BUNDLETYPE, "0");// 不支持套餐 39 paramMap.put(SearchRequestParams.PARAM_SEARCH_BUNDLETYPE, "0");// 不支持套餐
41 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITEDBUY, "N");// 不支持限购 40 paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITEDBUY, "N");// 不支持限购
42 - // paramMap.put(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE,"N");//不支持定金促销 41 + paramMap.put(SearchRequestParams.PARAM_SEARCH_ISDESPOSITADVANCE, "N");// 不支持定金预售
  42 + paramMap.put(SearchRequestParams.PARAM_SEARCH_ISLIMITTIMEADVANCE, "N");// 不支持定金促销
43 } 43 }
44 - 44 +
45 @Override 45 @Override
46 public SearchApiResult productList(Map<String, String> paramMap) { 46 public SearchApiResult productList(Map<String, String> paramMap) {
47 try { 47 try {