Commit 05ffe673 authored by shangying's avatar shangying

已经提交了?再试一下?

parent 81baf8d7
...@@ -6,23 +6,23 @@ import lombok.Data; ...@@ -6,23 +6,23 @@ import lombok.Data;
* Created by shang on 2020/1/3. * Created by shang on 2020/1/3.
*/ */
@Data @Data
public class OneClickOv { public class OneClickMsgResult {
private String loanId; private String loanId;
private String loanMessage; private String loanMessage;
private String creditMessage; private String creditMessage;
public OneClickOv(){} public OneClickMsgResult(){}
public OneClickOv(String loanId, String loanMessage, String creditMessage){ public OneClickMsgResult(String loanId, String loanMessage, String creditMessage){
this.loanId=loanId; this.loanId=loanId;
this.loanMessage=loanMessage; this.loanMessage=loanMessage;
this.creditMessage=creditMessage; this.creditMessage=creditMessage;
} }
public OneClickOv(String creditMessage){ public OneClickMsgResult(String creditMessage){
this.creditMessage=creditMessage; this.creditMessage=creditMessage;
} }
public OneClickOv(String loanId, String creditMessage){ public OneClickMsgResult(String loanId, String creditMessage){
this.loanId=loanId; this.loanId=loanId;
this.creditMessage=creditMessage; this.creditMessage=creditMessage;
} }
......
...@@ -7,11 +7,11 @@ import lombok.Data; ...@@ -7,11 +7,11 @@ import lombok.Data;
*/ */
@Data @Data
public class OneClickReslut { public class OneClickReslut {
private OneClickOv oneClickOv; private OneClickMsgResult oneClickOv;
private String message; private String message;
private Integer code; private Integer code;
public OneClickReslut(){} public OneClickReslut(){}
public OneClickReslut(OneClickOv oneClickOv,String message,Integer code){ public OneClickReslut(OneClickMsgResult oneClickOv,String message,Integer code){
this.oneClickOv=oneClickOv; this.oneClickOv=oneClickOv;
this.message=message; this.message=message;
this.code=code; this.code=code;
......
...@@ -45,7 +45,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService { ...@@ -45,7 +45,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService {
@Autowired @Autowired
private PhoneInfoService phoneInfoService; private PhoneInfoService phoneInfoService;
private OneClickOv oneClickOv; private OneClickMsgResult oneClickOv;
private ClfChannelConfiguration clfChannelConfiguration; private ClfChannelConfiguration clfChannelConfiguration;
private String md5Keywy = "qEAxMJBv"; private String md5Keywy = "qEAxMJBv";
private String aesKeywy = "sxD8KO79EDK0N0AJ"; private String aesKeywy = "sxD8KO79EDK0N0AJ";
...@@ -55,7 +55,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService { ...@@ -55,7 +55,7 @@ public class ApplyLoanServiceImpl implements ApplyLoanService {
public Result applyLoan(OneClickModel oneClickModel){ public Result applyLoan(OneClickModel oneClickModel){
JSONObject result; JSONObject result;
oneClickReslut=new Result(); oneClickReslut=new Result();
oneClickOv=new OneClickOv(); oneClickOv=new OneClickMsgResult();
//获取当前的渠道秘钥 //获取当前的渠道秘钥
clfChannelConfiguration=clfCenterService.findChannelConfigurationByChannelId(Long.parseLong(oneClickModel.getChannel().trim())); clfChannelConfiguration=clfCenterService.findChannelConfigurationByChannelId(Long.parseLong(oneClickModel.getChannel().trim()));
md5Keywy=clfChannelConfiguration.getMd5Key(); md5Keywy=clfChannelConfiguration.getMd5Key();
......
...@@ -103,7 +103,7 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{ ...@@ -103,7 +103,7 @@ public class CashWithdrawalServiceImpl implements CashWithdrawalService{
}else{ }else{
log.info("打印放款id,applicationHistory.getId()={}",applicationHistory.getId()); log.info("打印放款id,applicationHistory.getId()={}",applicationHistory.getId());
} }
return new Result(ApplicationStatus.SUCCESS,new OneClickOv(applicationHistory.getId().toString().trim(),LoanStatusEnum.APPLY_WITHDRAWDEPOSIT.getDesc(),CreditStatusEnum.CREDIT_SUCC.getDesc())); return new Result(ApplicationStatus.SUCCESS,new OneClickMsgResult(applicationHistory.getId().toString().trim(),LoanStatusEnum.APPLY_WITHDRAWDEPOSIT.getDesc(),CreditStatusEnum.CREDIT_SUCC.getDesc()));
}else{ }else{
return Result.buildFail(msg) ; return Result.buildFail(msg) ;
} }
......
...@@ -160,7 +160,7 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{ ...@@ -160,7 +160,7 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
}else{ }else{
log.info("修改失败 !!!!!"); log.info("修改失败 !!!!!");
} }
return new Result(ApplicationStatus.SUCCESS,new OneClickOv(CreditStatusEnum.DEFAULT.getDesc()),"风控授信回调通知成功"); return new Result(ApplicationStatus.SUCCESS,new OneClickMsgResult(CreditStatusEnum.DEFAULT.getDesc()),"风控授信回调通知成功");
}else{ }else{
num++; num++;
log.info("打印循环次数num:{}",num); log.info("打印循环次数num:{}",num);
...@@ -262,7 +262,7 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{ ...@@ -262,7 +262,7 @@ public class CreditGrantingServiceImpl implements CreditGrantingService{
}else{ }else{
log.info("修改失败 !!!!!"); log.info("修改失败 !!!!!");
} }
return new Result(ApplicationStatus.SUCCESS,new OneClickOv(CreditStatusEnum.DEFAULT.getDesc()),"风控授信回调通知成功"); return new Result(ApplicationStatus.SUCCESS,new OneClickMsgResult(CreditStatusEnum.DEFAULT.getDesc()),"风控授信回调通知成功");
}else{ }else{
return Result.buildFail("风控授信回调通知成功失败!!!,请检查数据") ; return Result.buildFail("风控授信回调通知成功失败!!!,请检查数据") ;
} }
......
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