Authored by 胡古飞

Merge branch 'master' into 5.6-global

... ... @@ -155,7 +155,7 @@ public class PromotionServiceImpl implements IPromotionService {
// 判断 非skn
if (StringUtils.isNotBlank(param.getNotProductSkn())) {
BoolQueryBuilder sknFilter = QueryBuilders.boolQuery();
sknFilter.mustNot(QueryBuilders.termsQuery("productSkn", param.getProductSknStr().split(",")));
sknFilter.mustNot(QueryBuilders.termsQuery("productSkn", param.getNotProductSkn().split(",")));
if (isAnd) {
conditionFilter.must(sknFilter);
} else {
... ...