Commit 71a43035 authored by 王业雄's avatar 王业雄

fix 手机号不支持号段

parent 4fa2dc05
...@@ -2,6 +2,7 @@ package com.quantgroup.asset.distribution.service.newrule; ...@@ -2,6 +2,7 @@ package com.quantgroup.asset.distribution.service.newrule;
import cn.quantgroup.motan.bean.UserAssociationBean; import cn.quantgroup.motan.bean.UserAssociationBean;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.AviatorEvaluator;
...@@ -47,6 +48,7 @@ import java.util.ArrayList; ...@@ -47,6 +48,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.IntStream;
/** /**
* @author shihuajun * @author shihuajun
...@@ -219,8 +221,9 @@ public class CoreFilter { ...@@ -219,8 +221,9 @@ public class CoreFilter {
List<ProductRuleEntity> ruleEntityList = productRuleService.getAll(); List<ProductRuleEntity> ruleEntityList = productRuleService.getAll();
Map<String, Object> env = Maps.newConcurrentMap(); Map<String, Object> env = Maps.newConcurrentMap();
if (StringUtils.isNotBlank(fundProduct.getTelRule())) { if (StringUtils.isNotBlank(fundProduct.getTelRule())) {
env.put(RuleConstant.NOT_PERMIT_TEL, Lists.newArrayList(Arrays.stream(fundProduct.getTelRule() // env.put(RuleConstant.NOT_PERMIT_TEL, Lists.newArrayList(Arrays.stream(fundProduct.getTelRule()
.split(CommonConstants.COMMA)).mapToInt(s -> Integer.parseInt(s)))); // .split(CommonConstants.COMMA)).mapToInt(s -> Integer.parseInt(s))));
env.put(RuleConstant.NOT_PERMIT_TEL, JSONArray.parseArray(fundProduct.getTelRule()).toJavaList(String.class));
} }
for (ProductRuleEntity pre : ruleEntityList) { for (ProductRuleEntity pre : ruleEntityList) {
if (pre.getEnable().equals(new Byte("0"))) { if (pre.getEnable().equals(new Byte("0"))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment