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

 package com.jqtx.windows.command;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Assert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.jqtx.windows.common.exception.BizException;
@@ -46,10 +47,14 @@ public class LoanSubmitCommand extends AbstractCommand {
     public JsonResult execute() {
         String request = RuntimeContextHolder.currentRuntimeContext().getRequestBody();
         LoanSubmitResponse loanSubmitResponse = JSON.parseObject(request, LoanSubmitResponse.class);
-        CreditModel byOrderNo = creditComponent.getByOrderNo(loanSubmitResponse.getOrderNo());
-        if (Objects.isNull(byOrderNo)) {
+        CreditModel creditModel = creditComponent.getByOrderNo(loanSubmitResponse.getOrderNo());
+        if (Objects.isNull(creditModel)) {
             throw new BizException(ExceptionCodeEnum.BIZ_CREDIT_NOT_FOUND_ERROR);
         }
+        //查询loan表是否存在
+        LoanModel loanComponentByLoanNo = loanComponent.getByLoanNo(loanSubmitResponse.getLoanNo());
+        Assert.isFalse(loanComponentByLoanNo != null, "重新借款单");
+
         // 保存windows_loan表
         LoanModel loanModel = new LoanModel();
         loanModel.setOrderNo(loanSubmitResponse.getOrderNo());
@@ -62,17 +67,17 @@ public class LoanSubmitCommand extends AbstractCommand {
             throw new BizException(ExceptionCodeEnum.SYSTEM_SQL_INSERT_ERROR);
         }
 
-        JSONObject thirdCredit=new JSONObject();
-        thirdCredit.put("reqNo",loanSubmitResponse.getOrderNo());
-        thirdCredit.put("type","01");
+        JSONObject thirdCredit = new JSONObject();
+        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);
         // 提现授信
-        LoanCreditSubmitModel loanCreditSubmitModel = new LoanCreditSubmitModel();
-        loanCreditSubmitModel.setOrderNo(byOrderNo.getOrderNo());
-        JsonResult<Boolean> booleanJsonResult = wakandaFeignService.loanCredit(loanCreditSubmitModel);
+        LoanCreditSubmitModel model = new LoanCreditSubmitModel();
+        model.setOrderNo(byOrderNo.getOrderNo());
+        JsonResult<Boolean> booleanJsonResult = wakandaFeignService.loanCredit(model);
         return JsonResult.success(booleanJsonResult.isSuccess());
     }
 }