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 {
* 判断促销和skn是否匹配
*/
public boolean matchProduct(PromotionCond promotionCond, Map<String, Object> productMap) {
try {
boolean matchResult;
if (promotionCond == null) {
return false;
... ... @@ -43,6 +44,10 @@ public class PromotionMatchService {
MapUtils.getIntValue(productMap, "id"), promotionCond.getPromotionId(), promotionCond.getPromotionTitle());
}
return matchResult;
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return false;
}
/**
... ...
package com.yoho.search.service.scene.common;
<<<<<<< HEAD
import com.alibaba.fastjson.JSONArray;
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
... ... @@ -17,8 +15,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
>>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002
import com.alibaba.fastjson.JSONObject;
import com.yoho.search.base.utils.ISearchConstants;
import com.yoho.search.common.cache.SearchCacheMatchLogger;
... ... @@ -30,25 +26,6 @@ import com.yoho.search.models.SearchApiResult;
import com.yoho.search.service.aggregations.impls.AggregationFactoryService;
import com.yoho.search.service.base.SearchCommonService;
import com.yoho.search.service.helper.SearchParamHelper;
<<<<<<< HEAD
import com.yoho.search.service.service.IAggRecommendService;
import org.elasticsearch.index.query.BoolQueryBuilder;
import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
import org.elasticsearch.search.aggregations.Aggregation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
=======
>>>>>>> 72f2270bacc8afa04b74ad355cd7b0173b5d0002
@Service
public class SceneSelectionsService extends AbstractCacheAbleService {
... ...