日志

src/main/java/com/quantgroup/asset/distribution/enums/route/UserLevel.java

@@ -16,7 +16,7 @@ public enum UserLevel {
     LEVEL5("level5","等级5"),
     LEVEL6("level6","等级6"),
     LEVEL7("level7","等级7"),
-    NO_LEVEL("no_level","无等级");
+    ;
 
     private String value;
 

src/main/java/com/quantgroup/asset/distribution/service/feature/impl/FeatureServiceImpl.java

@@ -66,13 +66,6 @@ public class FeatureServiceImpl implements IFeatureService {
         if (StringUtils.isBlank(uuid)){
             throw new RuntimeException("获取身份证信息参数为空");
         }
-        //todo remove
-        if (!TechEnvironment.isPro()) {
-            IdCardInfo info = new IdCardInfo();
-            info.setValid_date_begin("20170901");
-            info.setValid_date_end("20370901");
-            return info;
-        }
         Map<String,String> map = new HashMap<>();
         map.put("uuid", uuid);
         String responce = httpService.post(authUrl.concat("/auth-center/ex/phone/getOcrReturnResult.json"), map);

src/main/java/com/quantgroup/asset/distribution/service/jpa/entity/ChannelRuleEntity.java

@@ -171,11 +171,11 @@ public class ChannelRuleEntity {
 
     @Basic
     @Column(name = "priority", nullable = false)
-    public int getPriority() {
+    public Integer getPriority() {
         return priority;
     }
 
-    public void setPriority(int priority) {
+    public void setPriority(Integer priority) {
         this.priority = priority;
     }
 

src/main/java/com/quantgroup/asset/distribution/service/newrule/CoreFilter.java

@@ -321,8 +321,10 @@ public class CoreFilter {
             ruleParam.setUuid(auditResponce.getUuid());
             ruleParam.setCardExpireEnum(IdCardExpireEnum.parse(fundProduct.getCardLimit()));
             if (!ruleService.pass(ruleParam)) {
-                log.info("当前用户公共校验不通过 {}", JSON.toJSONString(associationBean));
+                log.info("当前用户公共校验不通过 {}, 规则:{}", JSON.toJSONString(associationBean), ruleService.getClass().getName());
                 return Boolean.FALSE;
+            } else {
+                log.info("当前用户校验通过，规则:{}", ruleService.getClass().getName());
             }
         }
         return Boolean.TRUE;

src/main/java/com/quantgroup/asset/distribution/service/newrule/RuleHandleFactory.java

@@ -38,7 +38,7 @@ public class RuleHandleFactory {
     public void init(){
         for (IRuleVerifyService ruleVerifyService : ruleVerifyServiceMap.values()) {
             if (ruleVerifyService.getClass().getName().contains("common")){
-
+                log.info("公共校验规则添加:{}", ruleVerifyService.getClass().getName());
                 COMMON_VERIFY.add(ruleVerifyService);
             }
         }

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

@@ -46,6 +46,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
         if (StringUtils.isBlank(param.getArea()) && !AreaEnum.NO_DEMAND.equals(param.getAreaNum())){
             throw new RuntimeException("区域配置有问题");
         }else if (AreaEnum.NO_DEMAND.equals(param.getAreaNum())){
+            log.info("地区校验通过NO_DEMAND");
             return Boolean.TRUE;
         }
         RuleParam.AreaRuleConcrete ruleConcrete = JacksonUtil.deserialize(param.getArea(), RuleParam.AreaRuleConcrete.class);
@@ -61,6 +62,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
                 hit.incrementAndGet();
             }
             if (AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+                log.info("地区校验通过CHOOSE_ONE_MORE");
                 return true;
             }
         }
@@ -79,6 +81,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
             }
             if (AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum())
                     || AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+                log.info("地区校验通过TWO_OUT_OF_MANY or CHOOSE_ONE_MORE");
                 return true;
             }
         }
@@ -92,6 +95,7 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
                 markdownMessage.setTitle("解析手机号出现问题");
                 markdownMessage.add(String.format(TEL_ALERM_TEXT,userInfo.getPhoneNo()));
                 alarmService.sendMsgWithAlert(markdownMessage);
+                log.info("地区校验通过,解析手机号出现问题");
                 return Boolean.TRUE;
             }
             String province = numberInfo.getProvince() + PROVINCE;
@@ -102,9 +106,11 @@ public class AreaVerifyImpl extends AbstractProductRuleVerifyImpl {
             if (AreaEnum.ALL_DEMAND.equals(param.getAreaNum())
                     || AreaEnum.TWO_OUT_OF_MANY.equals(param.getAreaNum())
                     || AreaEnum.CHOOSE_ONE_MORE.equals(param.getAreaNum())){
+                log.info("地区校验通过ALL_DEMAND or TWO_OUT_OF_MANY or CHOOSE_ONE_MORE");
                 return true;
             }
         }
+        log.info("地区校验未通过");
         return Boolean.FALSE;
     }
 

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

@@ -38,7 +38,8 @@ public class IdCardVerifyImpl extends AbstractProductRuleVerifyImpl{
         if (IdCardExpireEnum.CURRENT.equals(param.getCardExpireEnum())){
             return DateUtil.between(idCardInfo.getValid_date_begin(),validDateEnd);
         }else if (IdCardExpireEnum.EXPIRE_BIG_ONE.equals(param.getCardExpireEnum())){
-            return calcTermValidity(validDateEnd) >= 1;
+            //todo 改回1
+            return calcTermValidity(validDateEnd) >= 20;
         }else if (IdCardExpireEnum.EXPIRE_BIG_LOAN.equals(param.getCardExpireEnum())){
             String dateEnd = validDateEnd.substring(0,4) + CommonConstants.HORIZONTAL_LINE +
                     validDateEnd.substring(4,6) + CommonConstants.HORIZONTAL_LINE + validDateEnd.substring(6,8);

src/main/java/com/quantgroup/asset/distribution/service/newrule/specialrules/ContactsNameSameVerifyImpl.java

@@ -46,6 +46,7 @@ public class ContactsNameSameVerifyImpl extends AbstractProductRuleVerifyImpl {
                 return false;
             }
         }
+        log.info("联系人姓名同名校验通过");
         return true;
     }
 

src/main/java/com/quantgroup/asset/distribution/service/newrule/specialrules/ContactsTelErrorVerifyImpl.java

@@ -35,18 +35,19 @@ public class ContactsTelErrorVerifyImpl extends AbstractProductRuleVerifyImpl {
         List<XContactInfo> contractResults = userInfo.getContractResults();
         if (CollectionUtils.isEmpty(contractResults)){
             log.warn("联系人手机号校验时发现联系人为空");
-            return true;
+            return false;
         }
         for (XContactInfo info : contractResults) {
             if (StringUtils.isBlank(info.getPhoneNo())){
                 log.warn("联系人手机号校验时发现联系人手机号为空，联系人信息 {}", JSON.toJSONString(info));
-                continue;
+                return false;
             }
             if (!this.telVerify(info.getPhoneNo())){
                 log.warn("联系人手机号校验时发现当前用户手机号有问题，联系人信息 {}", JSON.toJSONString(info));
                 return false;
             }
         }
+        log.info("联系人手机号正确性校验通过");
         return true;
     }
 

src/main/java/com/quantgroup/asset/distribution/service/newrule/specialrules/ContactsTelSameVerifyImpl.java

@@ -33,18 +33,19 @@ public class ContactsTelSameVerifyImpl extends AbstractProductRuleVerifyImpl {
         List<XContactInfo> contractResults = userInfo.getContractResults();
         if (CollectionUtils.isEmpty(contractResults)){
             log.warn("联系人手机号校验发现联系人为空");
-            return true;
+            return false;
         }
         for (XContactInfo info : contractResults) {
             if (StringUtils.isBlank(info.getPhoneNo())){
                 log.warn("联系人手机号校验发现联系人手机号为空，联系人信息 {}", JSON.toJSONString(info));
-                continue;
+                return false;
             }
             if (info.getPhoneNo().equals(param.getUserInfo().getPhoneNo())){
                 log.warn("联系人手机号校验发现当前用户与联系人手机号相同，联系人信息 {}", JSON.toJSONString(info));
                 return false;
             }
         }
+        log.info("联系人手机号同号校验通过");
         return true;
     }