Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jqtx/windows/command/LoanSubmitCommand.java

src/main/java/com/jqtx/windows/command/LoanSubmitCommand.java

@@ -47,8 +47,8 @@ public class LoanSubmitCommand extends AbstractCommand {
     public JsonResult execute() {
         String request = RuntimeContextHolder.currentRuntimeContext().getRequestBody();
         LoanSubmitResponse loanSubmitResponse = JSON.parseObject(request, LoanSubmitResponse.class);
-        CreditModel componentByOrderNo = creditComponent.getByOrderNo(loanSubmitResponse.getOrderNo());
-        if (Objects.isNull(componentByOrderNo)) {
+        CreditModel creditModel = creditComponent.getByOrderNo(loanSubmitResponse.getOrderNo());
+        if (Objects.isNull(creditModel)) {
             throw new BizException(ExceptionCodeEnum.BIZ_CREDIT_NOT_FOUND_ERROR);
         }
         //查询loan表是否存在
@@ -71,12 +71,12 @@ public class LoanSubmitCommand extends AbstractCommand {
         thirdCredit.put("reqNo", loanSubmitResponse.getOrderNo());
         thirdCredit.put("type", "01");
         abcHttpClient.postRequest(thirdCredit.toJSONString(), ZNPostUrlEnum.CREDIT_APPLY.getCode());
-        CreditModel creditModel=new CreditModel();
-        creditModel.setCreditThirdStatus("INIT");
-        creditComponent.updateByOrderNo(loanSubmitResponse.getOrderNo(),creditModel);
+        CreditModel creditModel1=new CreditModel();
+        creditModel1.setCreditThirdStatus("INIT");
+        creditComponent.updateByOrderNo(loanSubmitResponse.getOrderNo(),creditModel1);
         // 提现授信
         LoanCreditSubmitModel model = new LoanCreditSubmitModel();
-        model.setOrderNo(componentByOrderNo.getOrderNo());
+        model.setOrderNo(loanSubmitResponse.getOrderNo());
         JsonResult<Boolean> booleanJsonResult = wakandaFeignService.loanCredit(model);
         return JsonResult.success(booleanJsonResult.isSuccess());
     }