yoho-search / yoho-search-service · Commits

Go to a project

Authored by saihide
Commit 88bf23d6840d50ecec75382eafd2b43b1209a178 1 parent 688553e2

fix

Inline Side-by-side
Showing 2 changed files with 5 additions and 23 deletions
@@ -29,6 +29,7 @@ public class PromotionMatchService { @@ -29,6 +29,7 @@ public class PromotionMatchService {
29 * 判断促销和skn是否匹配 29 * 判断促销和skn是否匹配
30 */ 30 */
31 public boolean matchProduct(PromotionCond promotionCond, Map<String, Object> productMap) { 31 public boolean matchProduct(PromotionCond promotionCond, Map<String, Object> productMap) {
  32 + try {
32 boolean matchResult; 33 boolean matchResult;
33 if (promotionCond == null) { 34 if (promotionCond == null) {
34 return false; 35 return false;
@@ -43,6 +44,10 @@ public class PromotionMatchService { @@ -43,6 +44,10 @@ public class PromotionMatchService {
43 MapUtils.getIntValue(productMap, "id"), promotionCond.getPromotionId(), promotionCond.getPromotionTitle()); 44 MapUtils.getIntValue(productMap, "id"), promotionCond.getPromotionId(), promotionCond.getPromotionTitle());
44 } 45 }
45 return matchResult; 46 return matchResult;
  47 + } catch (Exception e) {
  48 + logger.error(e.getMessage(), e);
  49 + }
  50 + return false;
46 } 51 }
47 52
48 /** 53 /**
1 package com.yoho.search.service.scene.common; 1 package com.yoho.search.service.scene.common;
2 2
3 -<<<<<<< HEAD  
4 import com.alibaba.fastjson.JSONArray; 3 import com.alibaba.fastjson.JSONArray;
5 -=======  
6 import java.util.ArrayList; 4 import java.util.ArrayList;
7 import java.util.HashMap; 5 import java.util.HashMap;
8 import java.util.List; 6 import java.util.List;
@@ -17,8 +15,6 @@ import org.slf4j.Logger; @@ -17,8 +15,6 @@ import org.slf4j.Logger;
17 import org.slf4j.LoggerFactory; 15 import org.slf4j.LoggerFactory;
18 import org.springframework.beans.factory.annotation.Autowired; 16 import org.springframework.beans.factory.annotation.Autowired;
19 import org.springframework.stereotype.Service; 17 import org.springframework.stereotype.Service;
20 -  
21 ->>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002  
22 import com.alibaba.fastjson.JSONObject; 18 import com.alibaba.fastjson.JSONObject;
23 import com.yoho.search.base.utils.ISearchConstants; 19 import com.yoho.search.base.utils.ISearchConstants;
24 import com.yoho.search.common.cache.SearchCacheMatchLogger; 20 import com.yoho.search.common.cache.SearchCacheMatchLogger;
@@ -30,25 +26,6 @@ import com.yoho.search.models.SearchApiResult; @@ -30,25 +26,6 @@ import com.yoho.search.models.SearchApiResult;
30 import com.yoho.search.service.aggregations.impls.AggregationFactoryService; 26 import com.yoho.search.service.aggregations.impls.AggregationFactoryService;
31 import com.yoho.search.service.base.SearchCommonService; 27 import com.yoho.search.service.base.SearchCommonService;
32 import com.yoho.search.service.helper.SearchParamHelper; 28 import com.yoho.search.service.helper.SearchParamHelper;
33 -<<<<<<< HEAD  
34 -import com.yoho.search.service.service.IAggRecommendService;  
35 -import org.elasticsearch.index.query.BoolQueryBuilder;  
36 -import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;  
37 -import org.elasticsearch.search.aggregations.Aggregation;  
38 -import org.slf4j.Logger;  
39 -import org.slf4j.LoggerFactory;  
40 -import org.springframework.beans.factory.annotation.Autowired;  
41 -import org.springframework.stereotype.Service;  
42 -  
43 -import java.util.ArrayList;  
44 -import java.util.HashMap;  
45 -import java.util.List;  
46 -import java.util.Map;  
47 -import java.util.concurrent.CompletableFuture;  
48 -import java.util.concurrent.ExecutorService;  
49 -import java.util.concurrent.Executors;  
50 -=======  
51 ->>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002  
52 29
53 @Service 30 @Service
54 public class SceneSelectionsService extends AbstractCacheAbleService { 31 public class SceneSelectionsService extends AbstractCacheAbleService {