Skip to content

C
cash-loan-flow-boss
Commit 99e2d646 authored by shangying's avatar shangying
Browse files
Options

case参数配置化，增加巧盼进件、提现流程

parent cb4750c9
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 25 deletions
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/entity/UrlRequestConfig.java
View file @ 99e2d646
......@@ -19,6 +19,9 @@ public class UrlRequestConfig {
@Column(name = "channel_code")
private String channelCode;
@Column(name = "copera_name")
private String coperaName;
@Column(name = "channel_name")
private String channelName;
......@@ -33,4 +36,8 @@ public class UrlRequestConfig {
@Column(name = "param_type")
private String paramType;
@Column(name = "channel_code_params")
private String channelCodeParams;
}
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/repository/UrlRequestConfigRespository.java
View file @ 99e2d646
......@@ -13,6 +13,6 @@ import org.springframework.stereotype.Repository;
@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);
@Query(value = "select * from url_request_config where channel_code= ?1 and copera_name= ?2 order by id desc limit 1", nativeQuery = true)
UrlRequestConfig findByChannelCcode(String channelCode,String coperaName);
}
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/ApplyLoanServiceImpl.java
View file @ 99e2d646
......@@ -149,7 +149,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService {
String name = "简介";
String channelUserId = orderNoStart+"_"+ oneClickModel.getPhone();
Map<String, Object> paras=new HashMap<String, Object>();
boolean isOldApplyMethod=oneClickModel.getChannel().equals(ChannelEnum.ZHANGHZONG.getCode()) || oneClickModel.getChannel().equals(ChannelEnum.ZHANGHZONG.getCode())
boolean isOldApplyMethod=oneClickModel.getChannel().equals(ChannelEnum.ZHANGHZONG.getCode()) || oneClickModel.getChannel().equals(ChannelEnum.SHIGUANGFQ.getCode())
|| oneClickModel.getChannel().equals(ChannelEnum.XIAOJUMAO.getCode()) || oneClickModel.getChannel().equals(ChannelEnum.GUOMEI.getCode())
|| oneClickModel.getChannel().equals(ChannelEnum.WEIDIAN.getCode()) ;
if(isOldApplyMethod) {
......@@ -222,7 +222,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService {
public JSONObject getGeneralApply(OneClickModel oneClickModel,String channelCode,String orderNoStart,String name,String channelUserId,String md5Keywy,String aesKeywy) {
JSONObject result = null;
// 通过渠道code获取当前的配置
UrlRequestConfig urlRequestConfig=urlRequestConfigRespository.findByChannelCcode(oneClickModel.getChannel());
UrlRequestConfig urlRequestConfig=urlRequestConfigRespository.findByChannelCcode(oneClickModel.getChannel(),"apply");
log.info("获取当前的urlRequestConfig={}",urlRequestConfig);
orderNoStart=urlRequestConfig.getChannelCode();
orderNo = orderNoStart + "_" + oneClickModel.getPhone() + "_" + System.currentTimeMillis();
......@@ -231,23 +231,6 @@ public class ApplyLoanServiceImpl implements ApplyLoanService {
log.info("初始化参数={}",parasOrig);
String paras=getCovParas(parasOrig,channelUserId,orderNo,oneClickModel.getPhone());
log.info("转化后的参数={}",parasOrig);
// paras = "{\"userName\":\"管璐\",\"idCardNo\":\"640402197912226439\",\"cardNo\":\"6227001253210804606\"," +
// "\"reservePhone\":\"15201010007\",\"phone\":\""+oneClickModel.getPhone()+"\",\"area\":\"北京昌平\"," +
// "\"address\":\"湖北恩施利川团吧\",\"contactNameA\":\"王磊\",\"contactPhoneA\":\"13522221234\"," +
// "\"contactRelationA\":\"CLASSMATE\",\"contactNameB\":\"王大磊\",\"contactPhoneB\":\"13622224321\"," +
// "\"contactRelationB\":\"FRIEND\",\"channelOrderNo\":\""+channelUserId+"\"," +
// "\"applyTime\":\"20181029201058\",\"ocrInfo\":{\"nameOCR\":\"管璐\",\"idSexOCR\":\"男\"," +
// "\"idEthnicOCR\":\"土家族\",\"idBirthdayOCR\":\"19900726\",\"idNumberOCR\":\"640402197912226439\"," +
// "\"idIssueOrgOCR\":\"湖北省恩施州利川市公安局\",\"idDueTimeOCR\":\"20101010-20201010\"," +
// "\"idAddressOCR\":\"利川团吧\",\"idPositiveBase64\":\"aaa\",\"idNegativeBase64\":\"aaa\"," +
// "\"photoAssay\":\"c\"," +
// "\"email\":\""+"test@163.com"+"\",\"qq\":\""+"333"+"\"," +
// "\"coursePhoto\":[\"http://m.t-xiaoniu.com/img/down/2018_10/201810221520391549964159263.jpeg\"]," +
// "\"companyPhoto\":[\"http://m.t-xiaoniu.com/img/down/2018_10/201810221520541847976558146.jpeg\"]," +
// "\"resultIdcardPhoto\":{\"thresholds\":{\"1e-6\":78.038,\"1e-5\":74.399,\"1e-4\":69.315,\"1e-3\":62.169}," +
// "\"confidence\":\"74.498\"}},\"productInfo\":{\"salesStaffName\":\"销售A\",\"salesStaffPhone\":\"13012220000\"," +
// "\"businessId\":\"XN_000000001\",\"trainingCourseName\":\"课程1\",\"trainingCoursePrice\":\"10000.00\"," +
// "\"amount\":\"8000.00\",\"term\":\"4\",\"lessons\":\"50\"},\"paymentRemark\":\"小牛放款备注\"}";
String url = qapiHttp+urlRequestConfig.getUrlPath();
String encryptContent = GetEncryptContentAndMd5.getEncryptContent(paras, aesKeywy, md5Keywy);
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/impl/CashWithdrawalServiceImpl.java
View file @ 99e2d646
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.impl;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.UrlRequestConfig;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.*;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.UrlRequestConfigRespository;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CashWithdrawalService;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.LoanOperationService;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;
......@@ -45,6 +47,9 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
private LoanOperationService loanOperationService;
@Autowired
private ICardCheckRecordRepository iCardCheckRecordRepository;
@Autowired
private UrlRequestConfigRespository urlRequestConfigRespository;
private ClfChannelConfiguration clfChannelConfiguration;
private String md5Keywy = "qEAxMJBv";
private String aesKeywy = "sxD8KO79EDK0N0AJ";
......@@ -139,6 +144,10 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
String bankCode="CCB";
String bankName="建设银行";
boolean formIdIsTrue=oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID910.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID920.getDesc()) || oneClickData.getFundCorpId().equals(ResposeResultEnum.FUNDCORPID940.getDesc());
//走老提现逻辑或者走配置提现逻辑
boolean isOldApplyMethod=oneClickData.getChannel().equals(ChannelEnum.ZHANGHZONG.getCode()) || oneClickData.getChannel().equals(ChannelEnum.SHIGUANGFQ.getCode())
|| oneClickData.getChannel().equals(ChannelEnum.XIAOJUMAO.getCode()) || oneClickData.getChannel().equals(ChannelEnum.GUOMEI.getCode())
|| oneClickData.getChannel().equals(ChannelEnum.WEIDIAN.getCode()) ;
if(formIdIsTrue){
bankCardNumber=getBankCardNumberLasterNumberIsEvenNumbers();
......@@ -158,19 +167,26 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
CardCheckRecordEntity cardCheckRecordEntityReslut=iCardCheckRecordRepository.save(cardCheckRecordEntity);
// result=getH5CashWithdrawal(oneClickData,md5Keywy,aesKeywy,bankCardNumber,bankCode,bankName);
log.info("获取当前的卡信息={}",cardCheckRecordEntityReslut);
if(Objects.nonNull(cardCheckRecordEntityReslut)){
if(isOldApplyMethod){
result=getAPICashWithdrawal(oneClickData, md5Keywy, aesKeywy, bankCardNumber, bankCode, bankName);
}else{
result=getGeneralCashWithdrawal(oneClickData, md5Keywy, aesKeywy, bankCardNumber, bankCode, bankName);
}
}else {
log.info("插入支付中心卡信息失败了");
}
}else{
log.info("非云信的资方");
if(isOldApplyMethod){
result=getAPICashWithdrawal(oneClickData, md5Keywy, aesKeywy, bankCardNumber, bankCode, bankName);
}else{
result=getGeneralCashWithdrawal(oneClickData, md5Keywy, aesKeywy, bankCardNumber, bankCode, bankName);
}
}
return result;
}
public JSONObject getAPICashWithdrawal(OneClickData oneClickData,String md5Keywy,String aesKeywy,String bankCardNumber,String bankCode, String bankName){
......@@ -215,6 +231,44 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
return result;
}
public JSONObject getGeneralCashWithdrawal(OneClickData oneClickData,String md5Keywy,String aesKeywy,String bankCardNumber,String bankCode, String bankName){
JSONObject result = null;
// 通过渠道code获取当前的配置
UrlRequestConfig urlRequestConfig=urlRequestConfigRespository.findByChannelCcode(oneClickData.getChannelCode(), "withdraw");
log.info("获取当前的urlRequestConfig={}",urlRequestConfig);
//通过channel_order_no渠道订单号
String url = qapiHttp+urlRequestConfig.getUrlPath(); //url获取
String parasOrig=urlRequestConfig.getUrlParamJson();
String paras=getCovParas(oneClickData,parasOrig,bankCardNumber,bankCode,bankName); //获取json数据
String encryptContent = GetEncryptContentAndMd5.getEncryptContent(paras, aesKeywy, md5Keywy);
if(urlRequestConfig.getParamType().equals("string")) {
String content_map = "{\"content\":\"" + encryptContent + "\"}";
log.info("打印一下url={}", url);
log.info("查看结果content={}", content_map);
result = HttpRequest.doPostReturnResponseJson(url, content_map);
}else {
Map<String,String> content_map = new HashMap<String, String>();
content_map.put("content", encryptContent);
log.info("查看结果content={}", content_map);
result = HttpRequest.doPostReturnResponseJson(url, content_map);
}
return result;
}
public String getCovParas(OneClickData oneClickData,String parasOrig,String bankCardNumber,String bankCode ,String bankName){
String newParas="";
newParas=parasOrig.replace("{channelOrderNumber}",oneClickData.getChannelOrderNo());
newParas=newParas.replace("{bankCardNumber}",bankCardNumber);
newParas=newParas.replace("{bankCode}",bankCode);
newParas=newParas.replace("{bankName}",bankName);
newParas=newParas.replace("{reservePhoneNumber}",oneClickData.getPhone());
return newParas;
}
public JSONObject getH5CashWithdrawal(OneClickData oneClickData,String md5Keywy,String aesKeywy,String bankCardNumber,String bankCode, String bankName){
return null;
......@@ -292,6 +346,19 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
return paras;
}
/**
* 微店的申请提现
* */
public Map applyGeneralLoan(OneClickData oneClickData,String bankCardNumber,String bankCode,String bankName){
Map<String,String> paras = new HashMap<String, String>();
paras.put("channelOrderNumber",oneClickData.getChannelOrderNo());
paras.put("bankCardNumber",bankCardNumber);
paras.put("bankCode",bankCode);
paras.put("bankName",bankName);
paras.put("reservePhoneNumber", oneClickData.getPhone());
return paras;
}
/**
* 掌众老的申请提现
* */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment