身份证户籍校验fix

src/main/java/com/quantgroup/asset/distribution/service/newrule/common/AreaVerifyImpl.java

@@ -14,6 +14,7 @@ import com.quantgroup.asset.distribution.util.JacksonUtil;
 import com.quantgroup.asset.distribution.util.PhoneNumberGeo;
 import com.quantgroup.asset.distribution.util.PhoneNumberInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -58,8 +59,29 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
         if (StringUtils.isNotBlank(ruleConcrete.getNativeList())){
             String nativeList = ruleConcrete.getNativeList();
             String nativeCode = IdCardUtil.getCityCodeByIdCard(userInfo.getIdNo());
-            if (StringUtils.isNotBlank(nativeCode) && nativeList.contains(nativeCode)){
-                hit.incrementAndGet();
+            if (StringUtils.isNotBlank(nativeCode)){
+                String[] nativeCodeList = nativeList.replaceAll("\\[", "").replaceAll("]", "").split(",");
+                if (ArrayUtils.isNotEmpty(nativeCodeList)) {
+                    for (String configCode : nativeCodeList) {
+                        String provCode = nativeCode.substring(0, 2);
+                        String cityCode = nativeCode.substring(0, 4);
+                        if (configCode.endsWith("0000") && configCode.startsWith(provCode)) {
+                            log.info("省份匹配");
+                            hit.incrementAndGet();
+                            break;
+                        }
+                        if (configCode.endsWith("00") && configCode.startsWith(cityCode)) {
+                            log.info("城市匹配");
+                            hit.incrementAndGet();
+                            break;
+                        }
+                        if (!configCode.endsWith("00") && configCode.equals(nativeCode)) {
+                            log.info("区域匹配");
+                            hit.incrementAndGet();
+                            break;
+                        }
+                    }
+                }
             }
             if (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum()) && hit.get() >= AreaEnum.CHOOSE_ONE_MORE.getCode()){
                 log.info("地区校验通过CHOOSE_ONE_MORE");