Authored by 胡古飞

Merge branch 'master' into 5.6-global

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