地区校验fix

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

@@ -61,7 +61,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
             if (StringUtils.isNotBlank(nativeCode) && nativeList.contains(nativeCode)){
                 hit.incrementAndGet();
             }
-            if (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+            if (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum()) && hit.get() >= AreaEnum.CHOOSE_ONE_MORE.getCode()){
                 log.info("地区校验通过CHOOSE_ONE_MORE");
                 return true;
             }
@@ -79,8 +79,8 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
                     hit.incrementAndGet();
                 }
             }
-            if (AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum())
-                    || AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+            if ((AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum()) && hit.get() >= AreaEnum.TWO_OUT_OF_MANY.getCode())
+                    || (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum()) && hit.get() >= AreaEnum.CHOOSE_ONE_MORE.getCode())){
                 log.info("地区校验通过TWO_OUT_OF_MANY or CHOOSE_ONE_MORE");
                 return true;
             }
@@ -96,16 +96,16 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
                 markdownMessage.add(String.format(TEL_ALERM_TEXT,userInfo.getPhoneNo()));
                 alarmService.sendMsgWithAlert(markdownMessage);
                 log.info("地区校验通过,解析手机号出现问题");
-                return Boolean.TRUE;
+                return Boolean.FALSE;
             }
             String province = numberInfo.getProvince() + PROVINCE;
             String shi = numberInfo.getProvince() + SHI;
             if (telAreaNameList.contains(province) || telAreaNameList.contains(shi) || telAreaNameList.contains(numberInfo.getProvince()) ){
                 hit.incrementAndGet();
             }
-            if (AreaEnum.ALL_DEMAND.equals(param.getAreaNum())
-                    || AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum())
-                    || AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+            if ((AreaEnum.ALL_DEMAND.equals(param.getAreaNum()) && hit.get() >= AreaEnum.ALL_DEMAND.getCode())
+                || (AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum()) && hit.get() >= AreaEnum.TWO_OUT_OF_MANY.getCode())
+                || (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum()) && hit.get() >= AreaEnum.CHOOSE_ONE_MORE.getCode())){
                 log.info("地区校验通过ALL_DEMAND or TWO_OUT_OF_MANY or CHOOSE_ONE_MORE");
                 return true;
             }