Commit e9388ec7 authored by 技术部-韩成龙's avatar 技术部-韩成龙

如果配置不为空,则匹配参数是否符合

parent 0d302a8f
...@@ -213,14 +213,15 @@ public class CoreFilter { ...@@ -213,14 +213,15 @@ public class CoreFilter {
log.error("channelId不符"); log.error("channelId不符");
return Boolean.FALSE; return Boolean.FALSE;
} }
if (StringUtils.isNotBlank(auditResponce.getCreditLevel()) || (StringUtils.isNotBlank(auditResponce.getCreditLevel()) //如果配置不为空,则匹配参数是否符合
&& !channelRuleEntity.getUserLevel().contains(auditResponce.getCreditLevel()))) { if (StringUtils.isNotBlank(channelRuleEntity.getUserLevel())
log.error("CreditLevel不符"); && !channelRuleEntity.getUserLevel().contains(auditResponce.getCreditLevel())) {
log.error("CreditLevel不符 userLevel:{}", auditResponce.getCreditLevel());
return Boolean.FALSE; return Boolean.FALSE;
} }
if (StringUtils.isNotBlank(auditResponce.getUserTag()) || (StringUtils.isNotBlank(auditResponce.getUserTag()) if (StringUtils.isNotBlank(channelRuleEntity.getUserTag())
&& !channelRuleEntity.getUserTag().contains(auditResponce.getUserTag()))) { && !channelRuleEntity.getUserTag().contains(auditResponce.getUserTag())) {
log.error("UserTag不符"); log.error("UserTag不符, userTag:{}", auditResponce.getUserTag());
return Boolean.FALSE; return Boolean.FALSE;
} }
String basicRule = fundProduct.getBasicRule(); String basicRule = fundProduct.getBasicRule();
......
package com.quantgroup.asset.distribution.service.newrule.third; package com.quantgroup.asset.distribution.service.newrule.third;
import com.quantgroup.asset.distribution.enums.route.UserTag;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.math.NumberUtils;
import org.hibernate.validator.constraints.Length; import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
...@@ -126,4 +128,17 @@ public class AuditResponce { ...@@ -126,4 +128,17 @@ public class AuditResponce {
private String assetNo; private String assetNo;
public String getUserTag() {
if (!NumberUtils.isCreatable(userTag)) {
return userTag;
}
UserTag[] tags = UserTag.values();
for (UserTag tag : tags) {
if (Integer.valueOf(userTag).equals(tag.ordinal())) {
return tag.getValue();
}
}
return UserTag.OTHERS.getValue();
}
} }
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