联调修改

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

 package com.quantgroup.asset.distribution.service.feature.impl;
 
+import cn.quantgroup.tech.util.TechEnvironment;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.base.Stopwatch;
@@ -65,9 +66,16 @@ 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.postJson(authUrl.concat("/ex/phone/getOcrReturnResult.json"), map);
+        String responce = httpService.post(authUrl.concat("/auth-center/ex/phone/getOcrReturnResult.json"), map);
         List<IdCardInfo> idCardInfoList = JacksonUtil.deserializeList(responce, IdCardInfo.class);
         Optional<IdCardInfo> cardInfo = idCardInfoList.stream().filter(d -> d.getSide().equals("back")).findFirst();
         if (!cardInfo.isPresent()){

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

@@ -131,7 +131,7 @@ public class CoreFilter {
         FundInfo fundInfo = new FundInfo();
         fundInfo.setFundId(fundProduct.getFundId());
         fundInfo.setFundProductId(fundProduct.getFundProId() + "");
-        fundInfo.setCooperation(CooperationEnum.parse(fundProduct.getOrgType()));
+        fundInfo.setCooperation(CooperationEnum.parse(fundProduct.getOrgType()).ordinal());
         Terms term = new Terms();
         term.setTerm(Integer.parseInt(auditResponce.getTerm()));
         term.setFundInfos(Lists.newArrayList(fundInfo));

src/main/java/com/quantgroup/asset/distribution/service/newrule/pojo/enums/CooperationEnum.java

@@ -13,11 +13,11 @@ public enum CooperationEnum {
     /**
      * 助贷
      */
-    DIVERSION,
+    ASSISTANCE,
     /**
      * 导流
      */
-    ASSISTANCE;
+    DIVERSION;
 
     public static CooperationEnum parse(String name){
         if (StringUtils.isBlank(name)){

src/main/java/com/quantgroup/asset/distribution/service/newrule/pojo/funds/FundInfo.java

@@ -17,7 +17,8 @@ public class FundInfo {
     private Integer rateType = 1;
     private Integer feeType = 1;
     private Integer priority;
-    private CooperationEnum cooperation;
+    private Integer cooperation;
+    private Boolean waitFlg = Boolean.FALSE;
 
     /**
      * 产品

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

@@ -42,7 +42,7 @@ public class ContactsTelErrorVerifyImpl extends AbstractProductRuleVerifyImpl {
                 log.warn("联系人手机号校验时发现联系人手机号为空，联系人信息 {}", JSON.toJSONString(info));
                 continue;
             }
-            if (this.telVerify(info.getPhoneNo())){
+            if (!this.telVerify(info.getPhoneNo())){
                 log.warn("联系人手机号校验时发现当前用户手机号有问题，联系人信息 {}", JSON.toJSONString(info));
                 return false;
             }