增加h5并且增加了finalproduct_id的值

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/PhoneInfoService.java

@@ -3,6 +3,7 @@ package cn.quantgroup.cashloanflowboss.api.oneclickdata.service;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FinanceProduct;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;
 import cn.quantgroup.user.retbean.XUser;
+import com.alibaba.fastjson.JSONObject;
 
 import java.util.List;
 
@@ -23,48 +24,48 @@ public interface PhoneInfoService {
      * 同步session到xyqb
      * 返回空
      */
-    void sySessionToXYQB();
+    JSONObject sySessionToXYQB(String phone,String createdFrom)  throws Exception;
 
     /**
-     * 同步session到xyqb
-     * 返回空
+     * 查询用户信息通过手机号
+     * 返回XUser对象
      */
     XUser selectUserID(String phone);
 
     /**
      * 实名认证
      */
-    void authIdNo();
+    JSONObject authIdNo(String phone,String createdFrom)throws Exception;
 
     /**
      * 授信session同步
      */
-    void creditSession();
+    JSONObject creditSession(String productId,String phone,String createdFrom)throws Exception ;
 
     /**
      * 基础信息
      */
-    void authBasic2();
+    JSONObject authBasic2(String token)throws Exception ;
 
     /**
      * 进入上传身份证页
      */
-    void authOcrUrl();
+    String authOcrUrl()throws Exception ;
 
     /**
      * 上传正面
      */
-    void ocrAtuhUp();
+    JSONObject ocrAtuhUp(String ocrToken)throws Exception ;
 
     /**
      * 上传负面
      */
-    void ocrAtuhDown();
+    JSONObject ocrAtuhDown(String ocrToken)throws Exception ;
 
     /**
      * 提交拍照认证
      */
-    void ocrSubmit();
+    JSONObject ocrSubmit(String ocrToken)throws Exception ;
 
     /**
      * 查询授信中心ID
@@ -74,12 +75,12 @@ public interface PhoneInfoService {
     /**
      * 授信
      */
-    void spiderC();
+    void spiderC() ;
 
     /**
      * 提交审核
      */
-    void submitAuth();
+    JSONObject submitAuth(String token)throws Exception ;
 
     /**
      * 查询用户审核记录
@@ -99,12 +100,12 @@ public interface PhoneInfoService {
     /**
      * 授信完成通知xyqb
      */
-    void spiderFinishNotic();
+    JSONObject spiderFinishNotic(String quotaRecordOrderNo,String  channel);
 
     /**
      * 爬虫授权完成通知 xyqb
      */
-    void spiderReportFinishNotic();
+    JSONObject spiderReportFinishNotic(String quotaRecordOrderNo);
 
     /**
      * 800 修改配额产品类型

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/CreditGrantingServiceImpl.java

@@ -10,6 +10,7 @@ import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FinanceProduct;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;
+import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.IFinanceProductRepository;
 import cn.quantgroup.cashloanflowboss.utils.GetBiNoAndFinanceProducts;
 import cn.quantgroup.cashloanflowboss.utils.http.HttpRequest;
 import cn.quantgroup.user.retbean.XUser;
@@ -18,6 +19,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import sun.rmi.runtime.Log;
 
 import java.util.*;
 
@@ -40,6 +42,9 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
     @Autowired
     private FundsAllocationplanServiceImpl fundsAllocationplanService;
 
+    @Autowired
+    private IFinanceProductRepository iFinanceProductRepository;
+
     public final  static String txAmount = "2000";
     public final  static String rate = "0";
     @Value("${clotho.http.net}")
@@ -55,7 +60,7 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
         }else {
             log.info("非授信需要的状态，打印一下oneClickModel.getType()={},TypeEnum.LOANSUCCESS.getCode()={}",oneClickModel.getType(),TypeEnum.LOANSUCCESS.getCode());
         }
-            return  applyCreditNotify(oneClickModel,auditResult,0);
+            return  applyCreditNotify(oneClickModel, auditResult, 0);
     }
 
     @Override
@@ -198,14 +203,14 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
         log.info("打印一下xUser：{}",xUser);
         String uuid=xUser.getUuid();
         Long userId=xUser.getId();
-        log.info("打印一下userid={},oneClickModel={}",userId,oneClickData);    //通过用户id获取产品信息
+        log.info("打印一下userid={},oneClickModel={}", userId, oneClickData);    //通过用户id获取产品信息
         int productId= Integer.parseInt(quotaCredit.getProductId().toString().trim());
         String biNo = String.valueOf(quotaCredit.getProductType());
         String quotaRecordOrderNo=quotaCredit.getOrderNo();
         String getToken=phoneInfoService.getToken(oneClickData.getPhone(), oneClickData.getChannelCode());      // 通过手机号和渠道code获取token
-       log.info("打印当前的oneClickData={},auditResult={},quotaRecordOrderNo={},uuid={}, biNo={}, productId={},getToken={}",oneClickData,auditResult,quotaRecordOrderNo,uuid, biNo, productId,getToken);
+       log.info("打印当前的oneClickData={},auditResult={},quotaRecordOrderNo={},uuid={}, biNo={}, productId={},getToken={}", oneClickData, auditResult, quotaRecordOrderNo, uuid, biNo, productId, getToken);
         JSONObject result= getCreditNotifyResult(oneClickData,quotaCredit,auditResult,quotaRecordOrderNo,uuid, biNo, productId,getToken);
-        log.info("打印一下查看当前的授信状态={}",result);
+        log.info("打印一下查看当前的授信状态={}", result);
         String statusCode=result.get("statusCode").toString().trim();
         String statusCodeCompare="200";
         String context=result.get("context").toString().trim();
@@ -278,12 +283,19 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
     }
 
     public ArrayList getPublicInfo(OneClickModel oneClickModel){
+        String fundProductId="";
+
+        List<FinanceProduct> financeProducts= iFinanceProductRepository.findByFundCorpId(Long.getLong(oneClickModel.getFundID()));
+       if(financeProducts.size()>0){
+           fundProductId=financeProducts.get(0).getFundCorpId().toString().trim();
+       }
         ArrayList listPara1 = new ArrayList();
         listPara1.add(0, oneClickModel.getAmount());
         listPara1.add(1, oneClickModel.getTermNo());
         listPara1.add(2, oneClickModel.getFundID());
         listPara1.add(3, rate);
         listPara1.add(4, txAmount);
+        listPara1.add(5, fundProductId);
         return listPara1;
 
     }

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/H5BindingCardAndWithdrawDepositImpl.java

+package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.impl;
+
+import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.H5BindingCardAndWithdrawDeposit;
+
+/**
+ * Created by shang on 2020/1/21.
+ */
+public class H5BindingCardAndWithdrawDepositImpl implements H5BindingCardAndWithdrawDeposit {
+    @Override
+    public void accountPro() {
+
+    }
+
+    @Override
+    public void getXYQBAccountId() {
+
+    }
+
+    @Override
+    public void bindCard() {
+
+    }
+
+    @Override
+    public void cardAuthSms() {
+
+    }
+
+    @Override
+    public void cardAuthSmsConfirm() {
+
+    }
+
+    @Override
+    public void bindCardList() {
+
+    }
+
+    @Override
+    public void accountTrial() {
+
+    }
+
+    @Override
+    public void cashAfterBindingCard() {
+
+    }
+}

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/PhoneInfoServiceImpl.java

@@ -8,6 +8,8 @@ import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.FinanceProduct;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.IFinanceProductRepository;
 import cn.quantgroup.cashloanflowboss.spi.xyqb.repository.QuotaCreditRepository;
+import cn.quantgroup.cashloanflowboss.utils.ChineseIDCardNumberGenerator;
+import cn.quantgroup.cashloanflowboss.utils.CommonConstant;
 import cn.quantgroup.cashloanflowboss.utils.GetAuthorization;
 import cn.quantgroup.cashloanflowboss.utils.http.HttpRequest;
 import cn.quantgroup.user.retbean.XUser;
@@ -33,12 +35,16 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
 
     @Value("${NAMESPACE}")
     private String nameSpace;
-
     @Value("${passportapi.http}")
     private String passportapiHttp;
-
     @Value("${api.http.net}")
     private String apiHttp;
+    @Value("${scapi.http.net}")
+    private String scapiHttp;
+    @Value("${mapi.http.net}")
+    private String mapiHttp;
+    @Value("${sc.http.net}")
+    private String scHttp;
     @Autowired
     private QuotaCreditRepository quotaCreditRepository;
     @Autowired
@@ -83,8 +89,8 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
      */
     @Test(description = "同步session到xyqb")
     @Override
-    public void sySessionToXYQB() {
-
+    public JSONObject sySessionToXYQB(String phone,String createdFrom)  throws Exception{
+         token=getToken(phone,createdFrom);
         String url = apiHttp + "/ex/login/receive_token?token=" + token;
 
         Map<String, String> header = new HashMap<String, String>();
@@ -92,6 +98,7 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
         JSONObject reslut = HttpRequest.doGetReturnResponseJson(url, null, header);
         log.info("获取返回结果,{}", reslut);
         Assert.assertEquals(reslut.get("statusCode").toString().trim(), "0");
+        return reslut;
     }
 
     @Override
@@ -99,44 +106,140 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
         return xyqbUserService.findUserByPhoneNo(phone);
     }
 
+
+    /**
+     * 实名认证
+     */
     @Override
-    public void authIdNo() {
+    public JSONObject authIdNo(String phone,String createdFrom) throws Exception{
+        token=getToken(phone,createdFrom);
+        String url = apiHttp + "/loan/auth/id_no";
+        Map<String, String> paras = new HashMap<String, String>();
+        paras.put("name", "刘志");
+        paras.put("idNo", ChineseIDCardNumberGenerator.generate());
+        paras.put("idType", "0");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        log.info("获取返回结果={}", result);
+        return result;
 
     }
 
     @Override
-    public void creditSession() {
-
+    public JSONObject creditSession(String productId,String phone,String createdFrom) throws Exception {
+        String url = apiHttp + "/v3/credit/apply?productId=" + productId;
+        Map<String, String> header = new HashMap<String, String>();
+        token=getToken(phone,createdFrom);
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doGetReturnResponseJson(url, null, header);
+        log.info("获取返回结果={}", result);
+        Assert.assertEquals(result.get("code").toString().trim(), "0000");
+        return result;
     }
 
     @Override
-    public void authBasic2() {
-
+    public JSONObject authBasic2(String token) throws Exception {
+        String url = scapiHttp + "/auth/basic2/infos";
+        Map<String, String> paras = new HashMap<String, String>();
+        paras.put("firstName", "任明星");
+        paras.put("firstMobile", "13500000002");
+        paras.put("firstRelation", "2");
+        paras.put("secondName", "陈玉秋");
+        paras.put("secondMobile", "13500000001");
+        paras.put("secondRelation", "2");
+        paras.put("address", "互联网金融中心");
+        paras.put("city", "市辖区");
+        paras.put("cityCode", "110100");
+        paras.put("province", "北京市");
+        paras.put("provinceCode", "110000");
+        paras.put("district", "怀柔区");
+        paras.put("districtCode", "110116");
+        paras.put("vocation", "3");
+        paras.put("salary", "3");
+        paras.put("education", "3");
+        paras.put("email", "12345678@qq.com");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        log.info("获取返回结果={}", result);
+        Assert.assertEquals(result.get("code").toString().trim(), "0000");
+        return result;
     }
 
     @Override
-    public void authOcrUrl() {
-
+    public String authOcrUrl() throws Exception {
+        String url = mapiHttp + "/sc/auth/ocr/url";
+        Map<String, String> paras = new HashMap<String, String>();
+        String returnUrl = scHttp + "/auth-page";
+        paras.put("returnUrl", returnUrl);
+        paras.put("registerFrom", "1");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        JSONObject resultData = (JSONObject) result.get("data");
+        String  ocrToken = resultData.toString().trim().split("\\?")[1].split("&")[0].split("=")[1].toString().trim();
+        log.info("获取返回结果={}", result);
+        Assert.assertEquals(result.get("businessCode").toString().trim(), "0000");
+        return ocrToken;
     }
 
     @Override
-    public void ocrAtuhUp() {
-
+    public JSONObject ocrAtuhUp(String ocrToken) throws Exception {
+        String url = "http://operator.liangkebang.com/auth-center/h5/api/ocr/auth.json";
+        Map<String, String> paras = new HashMap<String, String>();
+        String img_str = CommonConstant.CERTIMAG_UP;
+        paras.put("img_str", img_str);
+        paras.put("card_type", "0");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", ocrToken);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        log.info("获取返回结果={}", result);
+        Assert.assertEquals(result.get("business_code").toString().trim(), "0");
+        return result;
     }
 
     @Override
-    public void ocrAtuhDown() {
+    public JSONObject ocrAtuhDown(String ocrToken) throws Exception {
 
+        String url = "http://operator.liangkebang.com/auth-center/h5/api/ocr/auth.json";
+        Map<String, String> paras = new HashMap<String, String>();
+        String img_str = CommonConstant.CERTIMAG_DWON;
+        paras.put("img_str", img_str);
+        paras.put("card_type", "1");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", ocrToken);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        log.info("获取返回结果={}" , result);
+        Assert.assertEquals(result.get("business_code").toString().trim(), "0");
+        return result;
     }
 
     @Override
-    public void ocrSubmit() {
+    public JSONObject ocrSubmit(String ocrToken) throws Exception {
 
+        String url = "http://operator.liangkebang.com/auth-center/h5/api/ocr/submit.json";
+        Map<String, String> paras = new HashMap<String, String>();
+        String img_str = CommonConstant.CERTIMAG_UP;
+        paras.put("real_name", CommonConstant.REAL_NAME);
+        paras.put("id_card_no", CommonConstant.ID_CARD_NO);
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", ocrToken);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        log.info("获取返回结果={}" , result);
+        Assert.assertEquals(result.get("business_code").toString().trim(), "0");
+        return result;
     }
 
     @Override
     public void getSpiderCenter() {
-
+  // 无用
     }
 
     @Override
@@ -145,8 +248,17 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
     }
 
     @Override
-    public void submitAuth() {
-
+    public JSONObject submitAuth(String token) throws Exception {
+        String url = scapiHttp + "/auth/submit";
+        Map<String, String> paras = new HashMap<String, String>();
+        paras.put("purpose", "-1");
+        paras.put("dimension", "");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        Assert.assertEquals(result.get("businessCode").toString().trim(), "0000");
+        return result;
     }
 
     @Override
@@ -165,13 +277,30 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
     }
 
     @Override
-    public void spiderFinishNotic() {
-
+    public JSONObject spiderFinishNotic(String quotaRecordOrderNo,String  channel) {
+        String url = apiHttp + "/ex/spider_center/spider_finish";
+        Map<String, String> paras = new HashMap<String, String>();
+        paras.put("orderNo", quotaRecordOrderNo);
+        paras.put("extData", "{\"channelId\":\"" + channel + "\"}");
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        Assert.assertEquals(result.get("statusCode").toString().trim(), "200");
+        return result;
     }
 
     @Override
-    public void spiderReportFinishNotic() {
-
+    public JSONObject spiderReportFinishNotic(String quotaRecordOrderNo) {
+        String url = apiHttp + "/ex/spider_center/report_finish";
+        Map<String, String> paras = new HashMap<String, String>();
+        paras.put("orderNo", quotaRecordOrderNo);
+        Map<String, String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        header.put("x-auth-token", token);
+        JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
+        Assert.assertEquals(result.get("statusCode").toString().trim(), "200");
+        return result;
     }
 
     @Override