Commit cb951fcb authored by shangying's avatar shangying

修改了一些逻辑

parent 352a64d1
...@@ -12,4 +12,5 @@ public interface OneClickDataQueueOperateService { ...@@ -12,4 +12,5 @@ public interface OneClickDataQueueOperateService {
void getCreditNotifyIsSucess(String queueMsg); void getCreditNotifyIsSucess(String queueMsg);
Result commonFundAssifnSucc(OneClickData oneClickData); Result commonFundAssifnSucc(OneClickData oneClickData);
JSONObject applyLendingNotifyOnly(OneClickData oneClickData); JSONObject applyLendingNotifyOnly(OneClickData oneClickData);
void getBingSucc(OneClickData oneClickData);
} }
package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.impl; import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.LoanStatusEnum;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.spi.clf.model.LoanProgress;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;import lombok.extern.slf4j.Slf4j;import org.apache.commons.lang3.StringUtils;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 LoanOperationService loanOperationService; @Autowired private OneClickDataRespository oneClickDataRespository; @Autowired private CreditGrantingService creditGrantingService; @Autowired private OneClickDataQueueOperateService oneClickDataQueueOperateService; @Override public void excuteCreditSuccessJob() { } @Override public void excuteCreditFailJob() { } @Override public void excuteSelectCreditStatusJob() { //查找请求类型:2授信成功、3授信失败、4放款成功、5放款失败、6清算的单,7提现,并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList=oneClickDataRespository.findByCreditStatusAndTypeNotIn(0, 1); if(oneClickDataList.size()>0 || oneClickDataList !=null) { for (OneClickData oneClickData : oneClickDataList) { // 当前授信中的单在apply_quota 查看状态是apply_status=1 时间倒序,进行授信请求操作 log.info("打印一下oneClickData.getUserId()={},oneClickData.getChannelCode()={}",oneClickData.getUserId(),oneClickData.getChannelCode()); 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); } } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteFundSucessJob() { } @Override public void excuteFundFailJob() { } @Override public void excuteFundJob() { //查找请求类型:4放款成功、5放款失败、6清算的单,并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList = oneClickDataRespository.findByCreditStatusAndTypeNotIn(2, 1, 2, 3, 7); if (oneClickDataList.size() > 0 || oneClickDataList != null) { for (OneClickData oneClickData : oneClickDataList) { log.info("打印一下oneClickData.getLoanId={}", oneClickData.getLoanId()); if(StringUtils.isNotEmpty(oneClickData.getLoanId()) ){ LoanApplicationHistory loanApplicationHistory = loanOperationService.selectLoanId(Long.parseLong(oneClickData.getLoanId())); if (Objects.isNull(loanApplicationHistory)) { log.info("不符合放款条件的单"); } else { log.info("符合放款条件loanApplicationHistory={}", loanApplicationHistory); String progress=loanApplicationHistory.getProgress().getDescription().trim(); //提现操作尚未成功,重新操作提现 if(LoanProgress.WAITING_FUND.getDescription().equals(progress) || LoanProgress.START_ORDER.getDescription().equals(progress)){ // 没有成功提现,再次调用提现操作 oneClickDataQueueOperateService.applyLendingNotifyOnly(oneClickData); }else if(LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().equals(progress)){ try { String payStatus="3"; if(oneClickData.getType() == TypeEnum.LOANFAIL.getCode() ){ payStatus="4"; }else { payStatus="3"; } loanOperationService.payNotify(oneClickData,payStatus); } catch (Exception e) { log.info("进入异常e={}", e.getMessage()); } }else if(LoanProgress.CHECK_REPAYMENT_PLAN.getDescription().equals(progress)){ log.info("当前已经是放款状态了,直接修改放款成功15"); oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.CHECK_REPAYMENT_PLAN.getCode(), oneClickData.getId()); }else { log.info("当前的放款状态不对,非20 21 ,请查看数据库状态"); oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.LOAN_SCHEDULE_FAIL.getCode(), oneClickData.getId()); } } }else{ log.info("尚未生成放款单,未进入提现环节的错误数据"); } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteSelectFundStatusJob() { } } package cn.quantgroup.cashloanflowboss.api.oneclickdata.service.impl; import cn.quantgroup.cashloanflowboss.api.oneclickdata.entity.OneClickData;import cn.quantgroup.cashloanflowboss.api.oneclickdata.model.LoanStatusEnum;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.spi.clf.model.LoanProgress;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.LoanApplicationHistory;import cn.quantgroup.cashloanflowboss.spi.xyqb.entity.QuotaCredit;import lombok.extern.slf4j.Slf4j;import org.apache.commons.lang3.StringUtils;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 LoanOperationService loanOperationService; @Autowired private OneClickDataRespository oneClickDataRespository; @Autowired private CreditGrantingService creditGrantingService; @Autowired private OneClickDataQueueOperateService oneClickDataQueueOperateService; @Override public void excuteCreditSuccessJob() { } @Override public void excuteCreditFailJob() { } @Override public void excuteSelectCreditStatusJob() { //查找请求类型:2授信成功、3授信失败、4放款成功、5放款失败、6清算的单,7提现,并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList=oneClickDataRespository.findByCreditStatusAndTypeNotIn(0, 1); if(oneClickDataList.size()>0 || oneClickDataList !=null) { for (OneClickData oneClickData : oneClickDataList) { // 当前授信中的单在apply_quota 查看状态是apply_status=1 时间倒序,进行授信请求操作 log.info("打印一下oneClickData.getUserId()={},oneClickData.getChannelCode()={}",oneClickData.getUserId(),oneClickData.getChannelCode()); 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); } } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteFundSucessJob() { } @Override public void excuteFundFailJob() { } @Override public void excuteFundJob() { //查找请求类型:4放款成功、5放款失败、6清算的单,并且当前的授信状态是0授信中 List<OneClickData> oneClickDataList = oneClickDataRespository.findByCreditStatusAndTypeNotIn(2, 1, 2, 3, 7); if (oneClickDataList.size() > 0 || oneClickDataList != null) { for (OneClickData oneClickData : oneClickDataList) { log.info("打印一下oneClickData.getLoanId={}", oneClickData.getLoanId()); if(StringUtils.isNotEmpty(oneClickData.getLoanId()) ){ LoanApplicationHistory loanApplicationHistory = loanOperationService.selectLoanId(Long.parseLong(oneClickData.getLoanId())); if (Objects.isNull(loanApplicationHistory)) { log.info("不符合放款条件的单"); } else { log.info("符合放款条件loanApplicationHistory={}", loanApplicationHistory); String progress=loanApplicationHistory.getProgress().getDescription().trim(); //提现操作尚未成功,重新操作提现 if(LoanProgress.WAITING_FUND.getDescription().equals(progress) ){ log.info("二次风控成功:20,未进行金额放款21"); oneClickDataQueueOperateService.applyLendingNotifyOnly(oneClickData); }else if( LoanProgress.START_ORDER.getDescription().equals(progress)){ log.info("提现完毕50,二次风控没有成功"); oneClickDataQueueOperateService.getBingSucc(oneClickData); }else if(LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().equals(progress)){ try { String payStatus="3"; if(oneClickData.getType() == TypeEnum.LOANFAIL.getCode() ){ payStatus="4"; }else { payStatus="3"; } loanOperationService.payNotify(oneClickData,payStatus); } catch (Exception e) { log.info("进入异常e={}", e.getMessage()); } }else if(LoanProgress.CHECK_REPAYMENT_PLAN.getDescription().equals(progress)){ log.info("当前已经是放款状态了,直接修改放款成功15"); oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.CHECK_REPAYMENT_PLAN.getCode(), oneClickData.getId()); }else { log.info("当前的放款状态不对,非20 21 ,请查看数据库状态"); oneClickDataRespository.updateLoanStatusById(LoanStatusEnum.LOAN_SCHEDULE_FAIL.getCode(), oneClickData.getId()); } } }else{ log.info("尚未生成放款单,未进入提现环节的错误数据"); } } }else{ log.info("oneClickDataList为空={}",oneClickDataList); } } @Override public void excuteSelectFundStatusJob() { } }
\ No newline at end of file \ No newline at end of file
......
...@@ -145,6 +145,7 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe ...@@ -145,6 +145,7 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
} }
} }
@Override
public void getBingSucc(OneClickData oneClickData){ public void getBingSucc(OneClickData oneClickData){
//执行二次风控 //执行二次风控
JSONObject result= loanOperationService.orderAuditNotify(oneClickData); JSONObject result= loanOperationService.orderAuditNotify(oneClickData);
...@@ -165,9 +166,12 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe ...@@ -165,9 +166,12 @@ public class OneClickDataQueueOperateServiceImpl implements OneClickDataQueueOpe
log.info("打印一下progress={},LoanProgress.WAITING_FUND获取的值:{}",loanApplicationHistory.getProgress().getDescription(),LoanProgress.WAITING_FUND.getDescription()); log.info("打印一下progress={},LoanProgress.WAITING_FUND获取的值:{}",loanApplicationHistory.getProgress().getDescription(),LoanProgress.WAITING_FUND.getDescription());
// 获取的放款状态是 "发起提现,等待二次风控审核" "等待马上金融放款" "已发送给马上金融, 等待放款" // 获取的放款状态是 "发起提现,等待二次风控审核" "等待马上金融放款" "已发送给马上金融, 等待放款"
String progress=loanApplicationHistory.getProgress().getDescription().trim(); String progress=loanApplicationHistory.getProgress().getDescription().trim();
if(LoanProgress.WAITING_FUND.getDescription().equals(progress) || LoanProgress.START_ORDER.getDescription().equals(progress)|| LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().equals(progress)){ // LoanProgress.START_ORDER尚未成功二次风控哦??
if(LoanProgress.WAITING_FUND.getDescription().equals(progress) || LoanProgress.FINAL_SENDED_TO_FUNDING_CORP.getDescription().equals(progress)){
updateContrantAndApplyLendingNotify(oneClickData); updateContrantAndApplyLendingNotify(oneClickData);
}else if(LoanProgress.START_ORDER.getDescription().equals(progress)){
log.info("二次风控放款没有返回20,仍然是50重新操作一遍");
getBingSucc(oneClickData);
}else{ }else{
log.info("风控=loanApplicationHistory",loanApplicationHistory); log.info("风控=loanApplicationHistory",loanApplicationHistory);
// 放款状态:二次风控放款失败 // 放款状态:二次风控放款失败
......
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