优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@@ -838,6 +838,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     checkMap.put("priceRemarks", "");
                     checkMap.put("depositTotal", "");
                     checkMap.put("createOrgName", "");
+                    checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
 
 
                 }
@@ -896,7 +897,15 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
     }
 
     public String blackFile(Map<String, Object> map) {
-        String ftl = "dai_existingvehicles_black";
+        String ftl = "";
+        String name = "";
+        if("1".equals(map.get("payTypeKey").toString())){
+            ftl = "existingvehicles_black";
+            name = "全款新车买卖空白合同_";
+        }else{
+            ftl = "dai_existingvehicles_black";
+            name = "贷款新车买卖空白合同_";
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();
@@ -910,7 +919,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //新生成的word路径
         String wordPath = targetPath + typeName;
         //生成合同文件名
-        String pdfName = map.get("contractNo").toString() + "贷款新车买卖空白合同_" + dateStr + seconds + ".pdf";
+        String pdfName = map.get("contractNo").toString() + name + dateStr + seconds + ".pdf";
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }