|
|
@@ -2402,11 +2402,15 @@ public class FeeRuleSchemeServiceNewImpl implements FeeRuleSchemeNewService {
|
|
|
//将值进行分割
|
|
|
String[] split = ptlAgreementProductCostsAttrLink.getMin().split(",");
|
|
|
AtomicBoolean returnBool = new AtomicBoolean(false);
|
|
|
- Arrays.stream(split).forEach(x -> {
|
|
|
- if (value.equals(x)) {
|
|
|
- returnBool.set(true);
|
|
|
- }
|
|
|
- });
|
|
|
+ if(ptlAgreementProductCostsAttrLink.getAttrCode().equals("BrandandModel") && ptlAgreementProductCostsAttrLink.getOperator().equals("2")){
|
|
|
+ boolean anyMatch = Arrays.stream(split)
|
|
|
+ .anyMatch(value::contains);
|
|
|
+ returnBool.set(!anyMatch);
|
|
|
+ }else {
|
|
|
+ boolean anyMatch = Arrays.stream(split)
|
|
|
+ .anyMatch(value::contains);
|
|
|
+ returnBool.set(anyMatch);
|
|
|
+ }
|
|
|
return returnBool.get();
|
|
|
}
|
|
|
|