Skip to content

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

sonar问题修改3

parent 402bde46
Show whitespace changes
Inline Side-by-side
Showing with 132 additions and 81 deletions
src/main/java/cn/quantgroup/cashloanflowboss/BootstrapNew.java → src/main/java/cn/quantgroup/cashloanflowboss/BootstrapNewTest.java
View file @ edd80ac6
......@@ -12,7 +12,7 @@ import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest(classes = Bootstrap.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ContextConfiguration(initializers = ApolloPropertySourceInitializer.class)
public class BootstrapNew {
public class BootstrapNewTest {
@Value("${NAMESPACE}")
private String nameSpace;
@Value("${passportapi.http}")
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/model/ResposeResultEnum.java 0 → 100644
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.model;
import lombok.Getter;
/**
* Created by shang on 2019/12/31.
*/
@Getter
public enum ResposeResultEnum {
CODE(1, "0"),
BUSINESSCODE(2, "0000"),
STATUSCODE(3, "200"),
CONTEXT(4, "success");
private int code;
private String desc;
ResposeResultEnum(int code, String desc) {
this.code = code;
this.desc = desc;
}
}
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/repository/OneClickDataRespository.java
View file @ edd80ac6
......@@ -37,7 +37,7 @@ public interface OneClickDataRespository extends JpaRepository<OneClickData, Lon
OneClickData findByLoanId(String loanId);
// 通过授信状态查询,申请类型是非1的
@Query(value = "select * from one_click_data where credit_status = ?1 and type not in ?2 order by id desc limit 1", nativeQuery = true)
@Query(value = "select * from one_click_data where credit_status = ?1 and type not in ?2 order by id", nativeQuery = true)
List<OneClickData> findByCreditStatusAndTypeNotIn(Integer creditStatus,Integer type);
// 通过id修改 放款loanid
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/OneClickDataOperateJobServiceImpl.java deleted 100644 → 0
View file @ 402bde46
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl; import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickJobConfigRepository;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CreditGrantingService;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.OneClickDataOperateJobService;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;import lombok.extern.slf4j.Slf4j;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Service; import java.util.List;import java.util.Objects; /** * Created by shang on 2019/12/12. */@Slf4j@Servicepublic class OneClickDataOperateJobServiceImpl implements OneClickDataOperateJobService { @Autowired private PhoneInfoService phoneInfoService; @Autowired private OneClickDataRespository oneClickDataRespository; @Autowired private CreditGrantingService creditGrantingService; @Override public void excuteCreditSuccessJob() { } @Override public void excuteCreditFailJob() { } @Override public void excuteSelectCreditStatusJob() { //查找请求类型：2授信成功、4放款成功、5放款失败、6清算的单，并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList=oneClickDataRespository.findByCreditStatusAndTypeNotIn(0, 1); if(oneClickDataList.size()>0 || oneClickDataList !=null) { for (OneClickData oneClickData : oneClickDataList) { // 当前授信中的单在apply_quota 查看状态是apply_status=1 时间倒序,进行授信请求操作 QuotaCredit quotaCredit1 = phoneInfoService.selectUserAuditRecords(Long.parseLong(oneClickData.getUserId()), Long.parseLong(oneClickData.getChannelCode())); if (Objects.isNull(quotaCredit1)) { log.info("不符合授信审核申请的条件"); } else { //如何条件的单进行授信申请请求 log.info("符合授信审核申请的条件oneClickData={},quotaCredit1={}", oneClickData, quotaCredit1); try { creditGrantingService.authAmountAuditNotifyMq(oneClickData, quotaCredit1); } catch (Exception e) { log.info("进入异常e={}", e.getMessage()); } } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteFundSucessJob() { } @Override public void excuteFundFailJob() { } @Override public void excuteSelectFundStatusJob() { } }
\ No newline at end of file
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/ApplyLoanServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/ApplyLoanServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.*;
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/CashWithdrawalServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/CashWithdrawalServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.*;
......@@ -15,6 +15,7 @@ import cn.quantgroup.cashloanflowboss.utils.*;
import cn.quantgroup.cashloanflowboss.utils.http.HttpRequest;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
......@@ -43,6 +44,8 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
private ClfChannelConfiguration clfChannelConfiguration;
private String md5Keywy = "qEAxMJBv";
private String aesKeywy = "sxD8KO79EDK0N0AJ";
/**
*申请提现请求
* */
......@@ -73,7 +76,9 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
result= null;
}
String context=result.get("context").toString().trim();
if(!StringUtils.isBlank(context)){
String getDecryption = AESUtil.decryptAfterBase64Decode(context, aesKeywy);
log.info("解密的getDecryption的结果={}" + getDecryption);
JSONObject getDecryptionResult = (JSONObject) JSONObject.parse(getDecryption);
......@@ -81,10 +86,13 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
JSONObject bizData= (JSONObject) JSONObject.parse(getDecryptionResult.get("bizData").toString());
log.info("提现结果打印bizData={}",bizData);
String code=bizData.get("code").toString();
String codeCompare="0";
String businessCode=bizData.get("businessCode").toString();
String businessCodeCompare="0000";
String msg=bizData.get("msg").toString().trim();
log.info("msg={}",msg);
if((code.equals("0") && businessCode.equals("0000"))|| msg.equals("订单已经提现签约过")||(code.equals("0") && businessCode.equals("0200"))){
boolean isOk=(codeCompare.equals(code) && businessCodeCompare.equals(businessCode))|| "订单已经提现签约过".equals(msg)||("0".equals(code) && "0200".equals(businessCode));
if(isOk){
// 通过userid查看当前的提现记录是否生成放款loanid
LoanApplicationHistory applicationHistory=new LoanApplicationHistory();
// log.info("oneClickData.getUserId()={},quotaCredit.getProductType()={}",oneClickData.getUserId(),quotaCredit.getProductType());
......@@ -100,12 +108,15 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
return Result.buildFail(msg) ;
}
}
return Result.buildFail("获取结果值空context={}",context) ;
}
public LoanApplicationHistory verificationApplicationHistory(LoanApplicationHistory applicationHistory,Long userId,Integer businessType,int num){
if(Objects.isNull(applicationHistory)){
applicationHistory = loanOperationService.selectLoanId(userId, businessType);
if(num<50&& Objects.isNull(applicationHistory)){
int numsum=50;
if(num< numsum&& Objects.isNull(applicationHistory)){
num++;
verificationApplicationHistory(applicationHistory,userId, businessType,num);
}else{
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/CreditGrantingServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/CreditGrantingServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.CreditStatusEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.LoanStatusEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickModel;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickOv;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.*;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.ApplyLoanService;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CreditGrantingService;
......@@ -45,16 +42,17 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
@Autowired
private FundsAllocationplanServiceImpl fundsAllocationplanService;
public static String txAmount = "2000";
public static String rate = "0";
public final static String txAmount = "2000";
public final static String rate = "0";
@Value("${clotho.http.net}")
private String clothoHttp;
@Override
public Result authAmountAuditNotify(OneClickModel oneClickModel) throws Exception {
String auditResult="true";
if("2".equals(oneClickModel.getType()) || "4".equals(oneClickModel.getType()) || "5".equals(oneClickModel.getType())|| "6".equals(oneClickModel.getType()) || "7".equals(oneClickModel.getType())){
if(String.valueOf(TypeEnum.CREDITSUCCESS.getCode()).equals(oneClickModel.getType()) || String.valueOf(TypeEnum.LOANSUCCESS.getCode()).equals(oneClickModel.getType()) || String.valueOf(TypeEnum.LOANFAIL.getCode()).equals(oneClickModel.getType())|| String.valueOf(TypeEnum.LIQUIDATION.getCode()).equals(oneClickModel.getType()) || String.valueOf(TypeEnum.CASHWITHDRAWAL.getCode()).equals(oneClickModel.getType())){
auditResult="true";
}else if(oneClickModel.getType().equals("3")){
}else if(String.valueOf(TypeEnum.CREDITFAIL.getCode()).equals(oneClickModel.getType())){
auditResult="false";
}else {
log.info("非授信需要的状态，打印一下oneClickModel.getType()={}",oneClickModel.getType());
......@@ -65,9 +63,9 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
@Override
public Result authAmountAuditNotifyMq(OneClickData oneClickData, QuotaCredit quotaCredit) throws Exception {
String auditResult="true";
if("2".equals(oneClickData.getType()) || "4".equals(oneClickData.getType()) || "5".equals(oneClickData.getType())|| "6".equals(oneClickData.getType()) || "7".equals(oneClickData.getType())){
if(String.valueOf(TypeEnum.CREDITSUCCESS.getCode()).equals(oneClickData.getType()) || String.valueOf(TypeEnum.LOANSUCCESS.getCode()).equals(oneClickData.getType()) || String.valueOf(TypeEnum.LOANFAIL.getCode()).equals(oneClickData.getType())|| String.valueOf(TypeEnum.LIQUIDATION.getCode()).equals(oneClickData.getType()) || String.valueOf(TypeEnum.CASHWITHDRAWAL.getCode()).equals(oneClickData.getType())){
auditResult="true";
}else if("3".equals(oneClickData.getType())){
}else if(String.valueOf(TypeEnum.CREDITFAIL.getCode()).equals(oneClickData.getType())){
auditResult="false";
}else {
log.info("非授信需要的状态，打印一下oneClickModel.getType()={}",oneClickData.getType());
......@@ -235,8 +233,10 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
String statusCode=result.get("statusCode").toString().trim();
String statusCodeCompare="200";
String context=result.get("context").toString().trim();
if("200".equals(statusCode) && "success".equals(context)) {
String contextCompare="success";
if(statusCodeCompare.equals(statusCode) && contextCompare.equals(context)) {
//把授信请求通知的数据存放到表one_click_data中
int update= oneClickDataRespository.updateById(quotaRecordOrderNo.toString().trim(), quotaRecordOrderNo.toString().trim(), String.valueOf(productId).toString().trim(), getToken.toString().trim(),quotaCredit.getProductType(), oneClickData.getId());
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/FundsAllocationplanServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/FundsAllocationplanServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.ResposeResultEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.FundsAllocationplanService;
import cn.quantgroup.cashloanflowboss.utils.CoverDate;
import cn.quantgroup.cashloanflowboss.utils.http.HttpRequest;
......@@ -9,8 +9,6 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.testng.Assert;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.Map;
......@@ -50,7 +48,7 @@ public class FundsAllocationplanServiceImpl implements FundsAllocationplanServic
JSONObject result = HttpRequest.doGetReturnResponseJson(url);
JSONObject resultData = (JSONObject) result.get("data");
String businessCode=result.get("businessCode").toString().trim();
if("0000".equals(businessCode)){
if(ResposeResultEnum.BUSINESSCODE.getDesc().equals(businessCode)){
log.info("打印token:{}",resultData.get("token").toString().trim());
return resultData.get("token").toString().trim();
}else{
......@@ -79,7 +77,7 @@ public class FundsAllocationplanServiceImpl implements FundsAllocationplanServic
JSONObject result = HttpRequest.doPostReturnResponseJson(url, paras, header);
String businessCode=result.get("businessCode").toString().trim();
String code=result.get("code").toString().trim();
if("0000".equals(businessCode) && "0000".equals(code) ){
if(ResposeResultEnum.BUSINESSCODE.getDesc().equals(businessCode) && ResposeResultEnum.BUSINESSCODE.getDesc().equals(code) ){
boo=true;
}else {
boo=false;
......@@ -118,7 +116,7 @@ public class FundsAllocationplanServiceImpl implements FundsAllocationplanServic
JSONObject result = HttpRequest.doPostReturnResponseJson(url,paras, header);
String businessCode=result.get("businessCode").toString().trim();
String code=result.get("code").toString().trim();
if("0000".equals(businessCode) && "0000".equals(code) ){
if(ResposeResultEnum.BUSINESSCODE.getDesc().equals(businessCode) && ResposeResultEnum.BUSINESSCODE.getDesc().equals(code) ){
boo=true;
}else {
boo=false;
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/GuangDaXiaoDaiServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/GuangDaXiaoDaiServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.ResposeResultEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.GuangDaXiaoDaiService;
import cn.quantgroup.cashloanflowboss.spi.gyxd.entity.LoanApplicationManifestHistory;
import cn.quantgroup.cashloanflowboss.spi.gyxd.repository.ILoanApplicationManifestHistoryRepository;
......@@ -50,7 +50,7 @@ public class GuangDaXiaoDaiServiceImpl implements GuangDaXiaoDaiService {
JSONObject resultData = (JSONObject) result.get("data");
String businessCode=result.get("businessCode").toString().trim();
if("0000".equals(businessCode)){
if(ResposeResultEnum.BUSINESSCODE.getDesc().equals(businessCode)){
return resultData.get("token").toString().trim();
}else {
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/LoanOperationServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/LoanOperationServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.LoanStatusEnum;
......@@ -17,7 +17,6 @@ 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 org.testng.Assert;
import java.math.BigDecimal;
import java.util.HashMap;
......@@ -204,7 +203,8 @@ public class LoanOperationServiceImpl implements LoanOperationService{
// 查看当前的放款单的状态是21
LoanApplicationHistory loanApplicationHistory = loanOperationService.selectLoanId(Long.valueOf(oneClickData.getUserId().trim()), oneClickData.getBizType());
log.info("放款通知请求完毕后loanApplicationHistory={}", loanApplicationHistory);
if (loanApplicationHistory.getProgress().getDescription().trim().equals(LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().trim())) {
String progress=loanApplicationHistory.getProgress().getDescription().trim();
if (progress.equals(LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().trim())) {
//直投打款完毕进行放款操作
return payNotify(oneClickData, payStatus);
} else {
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/OneClickDataOperateJobServiceImpl.java 0 → 100644
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew; import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CreditGrantingService;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.OneClickDataOperateJobService;import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;import lombok.extern.slf4j.Slf4j;import org.springframework.beans.factory.annotation.Autowired;import org.springframework.stereotype.Service; import java.util.List;import java.util.Objects; /** * Created by shang on 2019/12/12. */@Slf4j@Servicepublic class OneClickDataOperateJobServiceImpl implements OneClickDataOperateJobService { @Autowired private PhoneInfoService phoneInfoService; @Autowired private OneClickDataRespository oneClickDataRespository; @Autowired private CreditGrantingService creditGrantingService; @Override public void excuteCreditSuccessJob() { } @Override public void excuteCreditFailJob() { } @Override public void excuteSelectCreditStatusJob() { //查找请求类型：2授信成功、4放款成功、5放款失败、6清算的单，并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList=oneClickDataRespository.findByCreditStatusAndTypeNotIn(0, 1); if(oneClickDataList.size()>0 || oneClickDataList !=null) { for (OneClickData oneClickData : oneClickDataList) { // 当前授信中的单在apply_quota 查看状态是apply_status=1 时间倒序,进行授信请求操作 QuotaCredit quotaCredit1 = phoneInfoService.selectUserAuditRecords(Long.parseLong(oneClickData.getUserId()), Long.parseLong(oneClickData.getChannelCode())); if (Objects.isNull(quotaCredit1)) { log.info("不符合授信审核申请的条件"); } else { //如何条件的单进行授信申请请求 log.info("符合授信审核申请的条件oneClickData={},quotaCredit1={}", oneClickData, quotaCredit1); try { creditGrantingService.authAmountAuditNotifyMq(oneClickData, quotaCredit1); } catch (Exception e) { log.info("进入异常e={}", e.getMessage()); } } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteFundSucessJob() { } @Override public void excuteFundFailJob() { } @Override public void excuteSelectFundStatusJob() { } }
\ No newline at end of file
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/OneClickDataOperateServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/OneClickDataOperateServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.OneClickModel;
......@@ -8,6 +8,7 @@ import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.ApplyLoanService;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.CreditGrantingService;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.OneClickDataOperateService;
import cn.quantgroup.cashloanflowboss.core.base.Result;
import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
import cn.quantgroup.cashloanflowboss.utils.GetEncryptContentAndMd5;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -19,7 +20,6 @@ import org.springframework.stereotype.Service;
import javax.persistence.criteria.Predicate;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
/**
* Created by shang on 2019/12/9.
......@@ -49,7 +49,7 @@ public class OneClickDataOperateServiceImpl implements OneClickDataOperateServic
@Override
public Result OneKeyCreditSuccessOrFail(OneClickModel oneClickModel) throws Exception {
Result creditResult=applyLoanService.applyLoan(oneClickModel);
if(creditResult.getCode()==200000){
if(creditResult.getCode()== ApplicationStatus.SUCCESS.getCode()){
log.info("申请成功后，进入风控回调环境={}",creditResult);
return creditGrantingService.authAmountAuditNotify(oneClickModel);
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/OneClickDataQueueOperateServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/OneClickDataQueueOperateServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.CreditStatusEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.LoanStatusEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.ResposeResultEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.TypeEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.repository.OneClickDataRespository;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.*;
import cn.quantgroup.cashloanflowboss.core.base.Result;
import cn.quantgroup.cashloanflowboss.core.dictionary.ApplicationStatus;
import cn.quantgroup.cashloanflowboss.spi.clf.model.LoanProgress;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;
......@@ -13,8 +16,6 @@ import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestParam;
import org.testng.Assert;
import java.util.Objects;
......@@ -62,7 +63,7 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
}
public void authAmountAuditNotify(OneClickData oneClickData, QuotaCredit quotaCredit)throws Exception{
if(oneClickData.getType() != 1) {
if(oneClickData.getType() != TypeEnum.APPLY.getCode()) {
creditGrantingService.authAmountAuditNotifyMq(oneClickData, quotaCredit);
}else{
log.info("进件申请流程无需走后续的授信流程:{}", oneClickData.getType());
......@@ -73,7 +74,7 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
// 修改授信状态授信成功CreditStatusEnum.CREDIT_SUCC
oneClickDataRespository.updateCreditStatusById(CreditStatusEnum.CREDIT_SUCC.getCode(), oneClickData.getId());
// 放款成功、放款失败、清单、提现的流程需要进行提现操作
if(oneClickData.getType() == 4 ||oneClickData.getType() == 5||oneClickData.getType() == 6||oneClickData.getType() == 7){
if(oneClickData.getType() == TypeEnum.LOANSUCCESS.getCode() ||oneClickData.getType() == TypeEnum.LOANFAIL.getCode() ||oneClickData.getType() == TypeEnum.LIQUIDATION.getCode() ||oneClickData.getType() == TypeEnum.CASHWITHDRAWAL.getCode()){
//执行提现操作
Result cashWithdrawalResult= cashWithdrawalService.applyLoan(oneClickData);
log.info("绑卡结果cashWithdrawalResult={}",cashWithdrawalResult);
......@@ -83,7 +84,7 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
public void isNotSecondaryRiskControl(Result cashWithdrawalResult,OneClickData oneClickData){
if(cashWithdrawalResult.getCode() == 200000){
if(cashWithdrawalResult.getCode() == ApplicationStatus.SUCCESS.getCode()){
// 提现成功了，返回绑卡成功了，进行二次风控操作
executeTheLendingProcess(oneClickData);
}else{
......@@ -202,8 +203,9 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
}
if (result.get("businessCode").toString().trim().equals("0000") && result.get("code").toString().trim().equals("0000")) {
//这边判断有问题需要改？？？？？？？？？？？？？？
// ?????????????
if (result.get("businessCode").toString().trim().equals(ResposeResultEnum.BUSINESSCODE.getCode()) && result.get("code").toString().trim().equals(ResposeResultEnum.BUSINESSCODE.getCode())) {
// 查看当前的放款单的状态是21
LoanApplicationHistory loanApplicationHistory = loanOperationService.selectLoanId(Long.valueOf(oneClickData.getUserId().trim()), oneClickData.getBizType());
log.info("放款请求成功后的loanApplicationHistory={}", loanApplicationHistory);
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/PhoneInfoServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/PhoneInfoServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.ResposeResultEnum;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.PhoneInfoService;
import cn.quantgroup.cashloanflowboss.spi.user.service.XyqbUserService;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;
......@@ -59,7 +60,7 @@ public class PhoneInfoServiceImpl implements PhoneInfoService {
JSONObject resultDate = (JSONObject) result.get("data");
String code=result.get("code").toString().trim();
String businessCode=result.get("businessCode").toString().trim();
if("0000".equals(code) && "0000".equals(businessCode)){
if(ResposeResultEnum.BUSINESSCODE.getDesc().equals(code) && ResposeResultEnum.BUSINESSCODE.getDesc().equals(businessCode)){
token = resultDate.get("token").toString().trim();
}else{
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/RepaymentPlatServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/RepaymentPlatServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.RepaymentPlatService;
import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.RepaymentPlan;
......
src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/Impl/ScheduleServiceImpl.java → src/main/java/cn/quantgroup/cashloanflowboss/api/oneclickdata/service/implnew/ScheduleServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl;
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.ScheduleService;
import cn.quantgroup.cashloanflowboss.spi.jolyne.JolyneService;
......
src/main/java/cn/quantgroup/cashloanflowboss/spi/rabbitmq/service/QueueServiceImpl.java
View file @ edd80ac6
package cn.quantgroup.cashloanflowboss.spi.rabbitmq.service;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.Impl.OneClickDataQueueOperateServiceImpl;
import cn.quantgroup.cashloanflowboss.api.oneclickdata.service.implnew.OneClickDataQueueOperateServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
src/main/java/cn/quantgroup/cashloanflowboss/utils/GetEncryptContentAndMd5.java
View file @ edd80ac6
......@@ -63,9 +63,10 @@ public class GetEncryptContentAndMd5 {
if (Integer.toHexString(0xFF & domain[i]).length() == 1) {
md5StrBuff.append("0").append(
Integer.toHexString(0xFF & domain[i]));
} else
} else {
md5StrBuff.append(Integer.toHexString(0xFF & domain[i]));
}
}
return md5StrBuff.toString();
}
......
src/main/java/cn/quantgroup/cashloanflowboss/utils/http/HttpService.java
View file @ edd80ac6
......@@ -154,9 +154,11 @@ public class HttpService {
httpGet = new HttpGet(uri);
System.out.println("请求的uri是：" + uri);
if(headerInfo!=null && !Objects.isNull(httpGet))
if(headerInfo!=null && !Objects.isNull(httpGet)){
setHttpHeaderInfo(httpGet, headerInfo);
}
CookieStore cookieStore=new BasicCookieStore();
HttpContext localContext = new BasicHttpContext();
localContext.setAttribute(ClientContext.COOKIE_STORE, cookieStore);
......@@ -165,11 +167,14 @@ public class HttpService {
try {
if (urlString.startsWith("https")) {
System.setProperty("jsse.enableSNIExtension", "false");
if (filePath == null)
if (filePath == null){
response = createSSLClientDefault().execute(httpGet,localContext);
else
} else{
response = createSSLClient(filePath, pwd).execute(
httpGet,localContext);
}
} else {
response = httpService.getHttpClient().execute(httpGet,localContext);
}
......@@ -247,13 +252,16 @@ public class HttpService {
try {
if (url.startsWith("https")) {
System.setProperty("jsse.enableSNIExtension", "false");
if (filePath == null)
if (filePath == null){
response = createSSLClientDefault().execute(httpPost,localContext);
else
} else{
response = createSSLClient(filePath, pwd).execute(
httpPost,localContext);
}
} else {
response = httpService.getHttpClient().execute(httpPost,localContext);
response = httpService.getHttpClient().execute(httpPost, localContext);
System.out.println("打印响应码》》》》： " + response.getStatusLine());
System.out.println("打印结果》》》》： " + response.getEntity());
}
......@@ -318,11 +326,14 @@ public class HttpService {
try {
if (url.startsWith("https")) {
System.setProperty("jsse.enableSNIExtension", "false");
if (filePath == null)
if (filePath == null){
response = createSSLClientDefault().execute(httpPost,localContext);
else
} else{
response = createSSLClient(filePath, pwd).execute(
httpPost,localContext);
}
} else {
response = httpService.getHttpClient().execute(httpPost,localContext);
System.out.println("打印响应码》》》》： " + response.getStatusLine());
......@@ -463,11 +474,15 @@ public class HttpService {
try {
if (url.startsWith("https")) {
System.setProperty("jsse.enableSNIExtension", "false");
if (filePath == null)
if (filePath == null){
response = createSSLClientDefault().execute(httpPost,localContext);
else
}else{
response = createSSLClient(filePath, pwd).execute(
httpPost,localContext);
}
} else {
response = httpService.getHttpClient().execute(httpPost,localContext);
}
......
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