Merge branch 'rong3_xincheng' into 'master'

融3导新城

See merge request !9

src/main/java/com/quantgroup/asset/distribution/service/funding/impl/AidFundRouteServiceImpl.java

@@ -3,11 +3,14 @@ package com.quantgroup.asset.distribution.service.funding.impl;
 import cn.quantgroup.motan.bean.UserInfo;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Stopwatch;
+import com.lkb.data.hbase.dataservice.verify.OCRIdCardDataService;
+import com.lkb.data.hbase.row.verify.OCRIdCardRow;
 import com.quantgroup.asset.distribution.constant.AidFundStatus;
 import com.quantgroup.asset.distribution.constant.aid.AidRiskInfoConstants;
 import com.quantgroup.asset.distribution.enums.UserLoanType;
 import com.quantgroup.asset.distribution.exception.QGExceptionType;
 import com.quantgroup.asset.distribution.exception.QGPreconditions;
+import com.quantgroup.asset.distribution.model.entity.OcrIdCardEntity;
 import com.quantgroup.asset.distribution.model.entity.user.SDKUserInfo;
 import com.quantgroup.asset.distribution.model.form.AssetForm;
 import com.quantgroup.asset.distribution.model.response.GlobalResponse;
@@ -23,6 +26,7 @@ import com.quantgroup.asset.distribution.service.redis.IRedisService;
 import com.quantgroup.asset.distribution.service.rule.IRuleService;
 import com.quantgroup.asset.distribution.service.user.IUserCenterService;
 import com.quantgroup.asset.distribution.util.DateUtil;
+import com.quantgroup.asset.distribution.util.OcrUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -288,6 +292,23 @@ public class AidFundRouteServiceImpl implements IAidFundRouteService {
                     assetForm.getUuid(), aidLoanFundConfig.getFundId(), aidLoanFundConfig.getFundProductId(), 0);
             return false;
         }
+
+        // OCR,活体照片缺失不导, 兼容融3自动2推缺失ocr、活体情况
+        List<OCRIdCardRow> rows = OCRIdCardDataService.get(assetForm.getUuid());
+        if (org.springframework.util.CollectionUtils.isEmpty(rows)) {
+            log.info("助贷资方导流, 用户ocr活体信息缺失, 不进行导流, uuid : {}, fundId : {}, fundProductId : {}",
+                    assetForm.getUuid(), aidLoanFundConfig.getFundId(), aidLoanFundConfig.getFundProductId());
+            return false;
+        }
+        OcrIdCardEntity ocrIdCardEntity = OcrUtils.transForm(rows.get(0));
+        if (Objects.isNull(ocrIdCardEntity.getIdCardA()) || Objects.isNull(ocrIdCardEntity.getIdCardB()) ||
+            StringUtils.isAnyEmpty(ocrIdCardEntity.getIdCardBaseContentA(), ocrIdCardEntity.getIdCardBaseContentB(), ocrIdCardEntity.getLivePhotoContent())) {
+
+            log.info("助贷资方导流, 用户ocr活体信息缺失, 不进行导流, uuid : {}, fundId : {}, fundProductId : {}",
+                    assetForm.getUuid(), aidLoanFundConfig.getFundId(), aidLoanFundConfig.getFundProductId());
+            return false;
+        }
+
         return true;
     }
 }