你我贷

src/main/java/com/quantgroup/asset/distribution/config/http/HttpClientConfig.java

@@ -20,6 +20,7 @@ import org.apache.http.protocol.HttpContext;
 import org.apache.http.ssl.SSLContexts;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.util.ClassUtils;
 
 import javax.net.ssl.*;
 import java.io.File;
@@ -124,10 +125,11 @@ public class HttpClientConfig {
                 return null;
             }
         };
+        String classesPath= ClassUtils.getDefaultClassLoader().getResource("").getPath();
         KeyStore keyStore = KeyStore.getInstance("PKCS12");
-        keyStore.load(new FileInputStream(new File("F:\\9_QFNEW\\data-export-platform\\src\\main\\resources\\niwodai\\qg-keystore.jks")), "password".toCharArray());
+        keyStore.load(new FileInputStream(new File(classesPath + "/niwodai/" + "qg-keystore.jks")), "password".toCharArray());
         SSLContext sslcontext = SSLContexts.custom()
-                .loadTrustMaterial(new File("F:\\9_QFNEW\\data-export-platform\\src\\main\\resources\\niwodai\\qg-truststore.jks"), "password".toCharArray(), new TrustSelfSignedStrategy())
+                .loadTrustMaterial(new File(classesPath + "/niwodai/" + "qg-truststore.jks"), "password".toCharArray(), new TrustSelfSignedStrategy())
                 .loadKeyMaterial(keyStore, "password".toCharArray())
                 .build();
         SSLConnectionSocketFactory sslConnectionSocketFactory = new SSLConnectionSocketFactory(

src/main/java/com/quantgroup/asset/distribution/service/niwodai/INiwodaiAssetService.java

 package com.quantgroup.asset.distribution.service.niwodai;
 
-import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiCostant;
+import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiDataImportCheckResponseVO;
 import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiIncomingResponseVO;
+import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiIncomingResultResponseVO;
 
 import java.util.Map;
 
 public interface INiwodaiAssetService {
 
 
-    NiwodaiIncomingResponseVO incoming(String uuid, String orderId, String amount, Integer term,
-                                       NiwodaiCostant.MnoData mnoData);
+    NiwodaiIncomingResultResponseVO incomingResult(String orderId);
+
+    NiwodaiDataImportCheckResponseVO dataCheck(String uuid);
+
+    NiwodaiIncomingResponseVO incoming(String uuid, String orderId, String amount, Integer term);
 
     Map<String,Object> queryUserBasic2Info(String userId, String phoneNo, boolean isQuery);
 }

src/main/java/com/quantgroup/asset/distribution/service/niwodai/INiwodaiService.java

 package com.quantgroup.asset.distribution.service.niwodai;
 
 
-import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiDataImportCheckRequestVO;
-import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiDataImportCheckResponseVO;
-import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiIncomingRequestVO;
-import com.quantgroup.asset.distribution.service.niwodai.vo.NiwodaiIncomingResponseVO;
+import com.quantgroup.asset.distribution.service.niwodai.vo.*;
 
 public interface INiwodaiService {
 
@@ -12,4 +9,6 @@ public interface INiwodaiService {
 
 
    NiwodaiIncomingResponseVO incoming(NiwodaiIncomingRequestVO niwodaiIncomingRequestVO);
+
+    NiwodaiIncomingResultResponseVO incoingResult(NiwodaiIncomingResultRequestVO requestVO);
 }

src/main/java/com/quantgroup/asset/distribution/service/niwodai/impl/NiwodaiAssetServiceImpl.java

 package com.quantgroup.asset.distribution.service.niwodai.impl;
 
 import cn.quantgroup.motan.bean.UserInfo;
-import cn.quantgroup.motan.enums.EducationEnum;
-import cn.quantgroup.motan.enums.IncomeRangeEnum;
 import cn.quantgroup.motan.vo.UserSysResult;
 import cn.quantgroup.user.IUserSdkService;
 import cn.quantgroup.user.UserSdkServiceFactory;
-import com.alibaba.druid.sql.visitor.functions.If;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
@@ -19,7 +16,6 @@ import com.quantgroup.asset.distribution.service.httpclient.IHttpService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiAssetService;
 import com.quantgroup.asset.distribution.service.niwodai.INiwodaiService;
 import com.quantgroup.asset.distribution.service.niwodai.vo.*;
-import com.quantgroup.asset.distribution.util.AddressResolutionUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +26,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -62,14 +57,48 @@ public class NiwodaiAssetServiceImpl implements INiwodaiAssetService {
     }
 
     @Override
-    public NiwodaiIncomingResponseVO incoming(String uuid, String orderId, String amount, Integer term,
-                                              NiwodaiCostant.MnoData mnoData) {
+    public NiwodaiIncomingResultResponseVO incomingResult(String orderId){
+        NiwodaiIncomingResultRequestVO vo = new NiwodaiIncomingResultRequestVO();
+        vo.setOrderId(orderId);
+        return niwodaiService.incoingResult(vo);
+    }
+
+    @Override
+    public NiwodaiDataImportCheckResponseVO dataCheck(String uuid){
+        NiwodaiDataImportCheckRequestVO requestVO = new NiwodaiDataImportCheckRequestVO();
+        requestVO.setExternalUserId(uuid);
+        UserSysResult<UserInfo> userInfoByUuid = userSdkService.findUserInfoByUuid(uuid);
+        if (!userInfoByUuid.isSuccess()){
+            log.error("准入检查获取用户中心信息失败 uuid : {}",uuid);
+            throw new QGException("获取用户中心信息失败", QGExceptionType.COMMON_ILLEGAL_PARAM);
+        }
+        requestVO.setPhone(userInfoByUuid.getData().getPhoneNo());
         List<OCRIdCardRow> list = OCRIdCardDataService.get(uuid);
         if (CollectionUtils.isEmpty(list)) {
+            log.error("准入检查获取用户OCR信息失败 uuid : {}",uuid);
+            throw new QGException("没有相关用户信息", QGExceptionType.COMMON_ILLEGAL_PARAM);
+        }
+        OCRIdCardRow ocrIdCardRow = list.get(0);
+        IdCardA idCardFront = JSON.parseObject(ocrIdCardRow.getIdCardContentA(), IdCardA.class);
+        requestVO.setIdcardNumber(idCardFront.getCitizen_id());
+        requestVO.setRealName(idCardFront.getName());
+        return niwodaiService.dataImportCheck(requestVO);
+    }
+
+
+    @Override
+    public NiwodaiIncomingResponseVO incoming(String uuid, String orderId, String amount, Integer term) {
+        List<OCRIdCardRow> list = OCRIdCardDataService.get(uuid);
+        if (CollectionUtils.isEmpty(list)) {
+            log.error("进件申请获取用户OCR信息失败 uuid : {}",uuid);
             throw new QGException("没有相关用户信息", QGExceptionType.COMMON_ILLEGAL_PARAM);
         }
         OCRIdCardRow ocrIdCardRow = list.get(0);
         UserSysResult<UserInfo> userInfoByUuid = userSdkService.findUserInfoByUuid(uuid);
+        if (!userInfoByUuid.isSuccess()){
+            log.error("进件申请获取用户中心信息失败 uuid : {}",uuid);
+            throw new QGException("获取用户中心信息失败", QGExceptionType.COMMON_ILLEGAL_PARAM);
+        }
         IdCardA idCardFront = JSON.parseObject(ocrIdCardRow.getIdCardContentA(), IdCardA.class);
         IdCardB idCardBack = JSON.parseObject(ocrIdCardRow.getIdCardContentB(), IdCardB.class);
         Map<String,Object> infoMap = queryUserBasic2Info(uuid,userInfoByUuid.getData().getPhoneNo(),true);
@@ -116,7 +145,7 @@ public class NiwodaiAssetServiceImpl implements INiwodaiAssetService {
         compnayInfo.setCity(userInfo.getCity());
         compnayInfo.setProvince(userInfo.getProvince());
         vo.setCompanyInfo(compnayInfo);
-        vo.setMnoData(mnoData);
+        vo.setMnoData(new NiwodaiCostant.MnoData());
         return niwodaiService.incoming(vo);
     }
 

src/main/java/com/quantgroup/asset/distribution/service/niwodai/impl/NiwodaiServiceImpl.java

@@ -34,6 +34,7 @@ public class NiwodaiServiceImpl implements INiwodaiService {
     private String authUrl;
     @Value("${niwodai.url.incoming}")
     private String incomingUrl;
+    private static String getIncomingResult = "/std/v1/apply-result";
     @Value("${niwodai.client.id}")
     private String clientId;
     @Value("${niwodai.client.secret}")
@@ -72,6 +73,21 @@ public class NiwodaiServiceImpl implements INiwodaiService {
         return null;
     }
 
+    @Override
+    public NiwodaiIncomingResultResponseVO incoingResult(NiwodaiIncomingResultRequestVO requestVO){
+        String token = getToken();
+        if (StringUtils.isEmpty(token)) {
+            log.error("你我贷获取进件结果时获取token失败,requestVO : {}", JSON.toJSONString(requestVO));
+            throw new QGException("你我贷获取进件结果时获取token失败", COMMON_THIRD_PARTY_TIMEOUT);
+        }
+        String result = iHttpService.postNiwodaiJson(domain2 + getIncomingResult, commonHeader(token), JSON.toJSONString(requestVO),true);
+        if (StringUtils.isNotEmpty(result)){
+            return JSON.parseObject(result, NiwodaiIncomingResultResponseVO.class);
+        }
+        return null;
+    }
+
+
     public String getToken() {
         String token = iRedisService.getString(RedisKeyConstants.NI_WO_DAI_TOKEN_KEY);
         if (StringUtils.isBlank(token)) {

src/main/java/com/quantgroup/asset/distribution/service/niwodai/vo/NiwodaiAccessTokenResponseVO.java

@@ -3,8 +3,10 @@ package com.quantgroup.asset.distribution.service.niwodai.vo;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class NiwodaiAccessTokenResponseVO {
+public class NiwodaiAccessTokenResponseVO implements Serializable {
 
     @JsonProperty("access_token")
     private String accessToken;

src/main/java/com/quantgroup/asset/distribution/service/niwodai/vo/NiwodaiIncomingResultRequestVO.java

+package com.quantgroup.asset.distribution.service.niwodai.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class NiwodaiIncomingResultRequestVO implements Serializable {
+    private String orderId;
+}

src/main/java/com/quantgroup/asset/distribution/service/niwodai/vo/NiwodaiIncomingResultResponseVO.java

+package com.quantgroup.asset.distribution.service.niwodai.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class NiwodaiIncomingResultResponseVO implements Serializable {
+
+    /**
+     * 300004:进件处理中; 300005:进件拒绝; 300006: 审批通过
+     */
+    private String code;
+
+    /**
+     * 审批金额
+     */
+    private BigDecimal approvedAmount;
+
+    /**
+     * 最小借款金额
+     */
+    private BigDecimal minAmount;
+
+    /**
+     * 步长
+     */
+    private BigDecimal step;
+
+    /**
+     * 额度有效期
+     */
+    private Date validBefore;
+}