增加url配置逻辑

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/controller/OneClickDataController.java

@@ -183,8 +183,14 @@ public class OneClickDataController {
 
 
     public Result onekeyApply(OneClickModel oneClickModel) {
+        if(oneClickModel.getChannel().equals(ChannelEnum.One.getCode())){
+            return  oneClickDataOperateService.h5OnekeyApply(oneClickModel);
 
+        }else {
             return  oneClickDataOperateService.onekeyApply(oneClickModel);
+
+        }
+
     }
 
     public Result oneKeyCashWithdrawal(OneClickModel oneClickModel) throws Exception{

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/entity/UrlRequestConfig.java

@@ -27,4 +27,10 @@ public class UrlRequestConfig {
 
     @Column(name = "url_param_json")
     private String urlParamJson;
+
+    @Column(name = "header")
+    private String header;
+
+    @Column(name = "param_type")
+    private String paramType;
 }

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/model/ChannelEnum.java

@@ -11,7 +11,15 @@ public enum ChannelEnum {
     SHIGUANGFQ("159865","时光分期"),
     XIAOJUMAO("159869","小桔猫"),
     GUOMEI("159843","国美"),
-    WEIDIAN("159849","微店");
+    WEIDIAN("159849","微店"),
+    XIAONIU("159509","小牛"),
+    PAIPAIDAI("159881","拍拍贷"),
+    MANDAO("159884","漫道"),
+    One("1","自有渠道"),
+    APP217("217","APP217"),
+    APP214("217","APP214"),
+    QIAOPAN("159879","巧盼");
+
 
 
     private String code;

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/model/CommonType.java

@@ -9,7 +9,6 @@ import lombok.Getter;
 public enum CommonType {
     PRODUCTTYPEONE(1,"1"),
     PRODUCTTYPETWO(2,"2"),
-    PRODUCTTYPETHR(3,"3"),
     PRODUCTTYPEFOUR(4,"4"),
     PRODUCTTYPETHREEN(3,"3"),
     PRODUCTID900(900,"900"),
@@ -20,7 +19,8 @@ public enum CommonType {
     PRODUCTID610(610,"610"),
     PRODUCTID650(650,"650"),
     PRODUCTID41(41,"41"),
-    PRODUCTID670(670,"670");
+    PRODUCTID670(670,"670"),
+    PRODUCTID1011(11,"1011");
     private int code;
 
     private String desc;

src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/repository/UrlRequestConfigRespository.java

+package cn.quantgroup.cashloanflowboss.api.oneclickdata.repository;
+
+import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.UrlRequestConfig;
+import cn.quantgroup.cashloanflowboss.core.persistence.CashLoanFlowBossDataSource;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Created by shang on 2020/4/7.
+ */
+@CashLoanFlowBossDataSource
+@Repository
+public interface UrlRequestConfigRespository extends JpaRepository<UrlRequestConfig,Long> {
+    //     通过userid、订单号查看
+    @Query(value = "select * from url_request_config where channel_code= ?1 order by id desc limit 1", nativeQuery = true)
+    UrlRequestConfig findByChannelCcode(String channelCode);
+}

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

 package cn.quantgroup.cashloanflowboss.api.oneclickdata.service;
 
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickModel;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
 
 /**
  * Created by shang on 2020/4/7.
@@ -9,6 +10,6 @@ public interface H5ApplyLoanService {
     /**
      * H5页面接口获取授信进件申请流程
      * */
-    void H5ApplyLoan(OneClickModel oneClickModel);
+    Result H5ApplyLoan(OneClickModel oneClickModel);
 
 }

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

@@ -14,6 +14,8 @@ public interface OneClickDataOperateService {
 
     Result onekeyApply(OneClickModel oneClickModel);
 
+    Result h5OnekeyApply(OneClickModel oneClickModel);
+
     Result oneKeyCashWithdrawal(OneClickModel oneClickModel) throws Exception;
 
     Result oneKeyCreditSuccessOrFail(OneClickModel oneClickModel) throws Exception;

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

@@ -194,7 +194,12 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
             channelCode="WEIDIAN";
             paras= applyWeiDianLoan(oneClickData, bankCardNumber, bankCode, bankName);
 
+        }else if(oneClickData.getChannelCode().equals(ChannelEnum.WEIDIAN.getCode())){
+            channelCode="BUCUNZAI";
+            log.info("小牛提现暂时不支持，后续流程不确定");
+
         }else{
+            //从配置中获取
 
         }
 

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

@@ -3,16 +3,24 @@ package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.impl;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickModel;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.H5ApplyLoanService;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;
+import cn.quantgroup.cashloanflowboss.core.base.Result;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * Created by shang on 2020/4/7.
  */
+@Slf4j
+@Service
 public class H5ApplyLoanServiceImpl implements H5ApplyLoanService {
     @Autowired
     private PhoneInfoService phoneInfoService;
+
     @Override
-    public void H5ApplyLoan(OneClickModel oneClickModel) {
+    public Result H5ApplyLoan(OneClickModel oneClickModel) {
+        Result oneClickReslut=new Result();
+        return oneClickReslut;
 
     }
 }

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

@@ -6,6 +6,7 @@ import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickSelectModel
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.ApplyLoanService;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CreditGrantingService;
+import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.H5ApplyLoanService;
 import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.OneClickDataOperateService;
 import cn.quantgroup.cashloanflowboss.core.base.Result;
 import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
@@ -33,6 +34,8 @@ public class OneClickDataOperateServiceImpl implements OneClickDataOperateServic
     @Autowired
     private ApplyLoanService applyLoanService;
     @Autowired
+    private H5ApplyLoanService h5ApplyLoanService;
+    @Autowired
     private CreditGrantingService creditGrantingService;
 
     @Override
@@ -40,6 +43,11 @@ public class OneClickDataOperateServiceImpl implements OneClickDataOperateServic
         return applyLoanService.applyLoan(oneClickModel);
     }
 
+    @Override
+    public Result h5OnekeyApply(OneClickModel oneClickModel) {
+        return null;
+    }
+
     @Override
     public Result oneKeyCashWithdrawal(OneClickModel oneClickModel)throws Exception {
 

src/main/java/cn/quantgroup/cashloanflowboss/utils/GetBiNoAndFinanceProducts.java

@@ -16,7 +16,30 @@ public class GetBiNoAndFinanceProducts {
         JSONArray financeProducts=new JSONArray();
         JSONArray terms=new JSONArray();
         JSONObject para1=new JSONObject();
-        if (productId == CommonType.PRODUCTTYPEONE.getCode() || productId == CommonType.PRODUCTTYPEFOUR.getCode() || productId == CommonType.PRODUCTID920.getCode() || productId == CommonType.PRODUCTID900.getCode() || productId == CommonType.PRODUCTID910.getCode() || productId == CommonType.PRODUCTTYPEONE.getCode()){
+       if(productId == CommonType.PRODUCTTYPETWO.getCode()){
+            getResult.put("biNo", "2");
+            para1.put("min", listPara1.get(4).toString().trim());
+            para1.put("max",listPara1.get(0).toString().trim());
+            int start=3;
+            int max=12;
+            for(int i=start;i<=max;i=i+start){
+                JSONObject jsonterm=new JSONObject();
+                jsonterm.put("term",i);
+                JSONArray fundInfo=new JSONArray();
+                JSONObject jsonFundInfo=new JSONObject();
+                jsonFundInfo.put("fundId",listPara1.get(2).toString().trim());
+                jsonFundInfo.put("rate",listPara1.get(3).toString().trim());
+                jsonFundInfo.put("rateType","1");
+                jsonFundInfo.put("priority","1");
+                jsonFundInfo.put("feeType","1");
+                fundInfo.add(jsonFundInfo);
+                jsonterm.put("fundInfo",fundInfo);
+                terms.add(jsonterm);
+            }
+            para1.put("terms",terms);
+            financeProducts.add(para1);
+            getResult.put("financeProducts",financeProducts);
+        }else{
             if(productId == CommonType.PRODUCTID900.getCode()){
 
                 getResult.put("biNo", "9");
@@ -28,13 +51,13 @@ public class GetBiNoAndFinanceProducts {
             }else if(productId == CommonType.PRODUCTID920.getCode() || productId == CommonType.PRODUCTID940.getCode()){
 
                 getResult.put("biNo", "9");
-            }else if(productId == 3){
+            }else if(productId == CommonType.PRODUCTTYPETHREEN.getCode()){
 
                 getResult.put("biNo", "4");
-            }else if(productId == 41){
+            }else if(productId == CommonType.PRODUCTID41.getCode()){
 
                 getResult.put("biNo", "4");
-            }else if(productId == 1011){
+            }else if(productId == Integer.parseInt(CommonType.PRODUCTID1011.getDesc())){
 
                 getResult.put("biNo", "10");
             }else{
@@ -61,29 +84,6 @@ public class GetBiNoAndFinanceProducts {
             para1.put("terms",terms);
             financeProducts.add(para1);
             getResult.put("financeProducts",financeProducts);
-        }else if(productId == CommonType.PRODUCTTYPETWO.getCode()){
-            getResult.put("biNo", "2");
-            para1.put("min", listPara1.get(4).toString().trim());
-            para1.put("max",listPara1.get(0).toString().trim());
-            int start=3;
-            int max=12;
-            for(int i=start;i<=max;i=i+start){
-                JSONObject jsonterm=new JSONObject();
-                jsonterm.put("term",i);
-                JSONArray fundInfo=new JSONArray();
-                JSONObject jsonFundInfo=new JSONObject();
-                jsonFundInfo.put("fundId",listPara1.get(2).toString().trim());
-                jsonFundInfo.put("rate",listPara1.get(3).toString().trim());
-                jsonFundInfo.put("rateType","1");
-                jsonFundInfo.put("priority","1");
-                jsonFundInfo.put("feeType","1");
-                fundInfo.add(jsonFundInfo);
-                jsonterm.put("fundInfo",fundInfo);
-                terms.add(jsonterm);
-            }
-            para1.put("terms",terms);
-            financeProducts.add(para1);
-            getResult.put("financeProducts",financeProducts);
         }
         return getResult;
     }
@@ -98,7 +98,7 @@ public class GetBiNoAndFinanceProducts {
             biNo="9";
         }else if(productId == CommonType.PRODUCTID41.getCode() || productId == CommonType.PRODUCTTYPETHREEN.getCode()){
             biNo="4";
-        }else if(productId == 1011){
+        }else if(productId == Integer.parseInt(CommonType.PRODUCTID1011.getDesc())){
             biNo="10";
         }
         return biNo;

src/main/java/cn/quantgroup/cashloanflowboss/utils/GetEncryptContentAndMd5.java

@@ -47,6 +47,37 @@ public class GetEncryptContentAndMd5 {
         return contentStr;
     }
 
+
+    /**
+     * 加密加签
+     * @param paras
+     * @param aesKeywy
+     * @param md5Keywy
+     * @return
+     */
+    public static String  getEncryptContent(String paras, String aesKeywy, String md5Keywy) {
+
+        String acs_url = "http://acs.liangkebang.com/encryptAndBase64Encode";
+        Map<String,String> para8 = new HashMap<String, String>();
+        final String bizData =  paras;
+        Map<String,String> contentMap= new HashMap<String, String>();
+        contentMap.put("bizData", bizData);
+        contentMap.put("sign", md5(bizData.concat(md5Keywy)));
+
+
+        para8.put("content", JSONObject.toJSONString(contentMap));
+        para8.put("key",aesKeywy);
+        Map<String,String> header = new HashMap<String, String>();
+        header.put("Content-Type", "application/x-www-form-urlencoded");
+        JSONObject content = HttpRequest.doPostReturnResponseJson(acs_url, para8, header);
+
+
+        String contentStr = content.get("context").toString();
+        log.info("查看结果={}", contentStr);
+        return contentStr;
+    }
+
+
     public static String md5(String content) {
         MessageDigest messageDigest;
         try {