合同

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

@@ -688,6 +688,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         //根据合同号查询销售订单数据
         BusSalesOrder busSalesOrder = baseMapper.selectByContract(contractNo);
         SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        if("1".equals(busSalesOrder.getPayTypeKey()) || ("2".equals(busSalesOrder.getPayTypeKey()) && StringUtils.isNotBlank(loanSolutions.getTypeKey()))) {
             List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
             BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
             BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
@@ -759,7 +760,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                 }
                 map.put("list", list);
-            map.put("name",busSalesOrder.getAffiliatedCompany());
+                map.put("name", busSalesOrder.getAffiliatedCompany());
                 String date = DateUtil.today();
                 List<String> dateString = Arrays.asList(date.split("-"));
                 String year = dateString.get(0);
@@ -816,7 +817,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
                         filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
                         filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
-                }else{
+                    } else {
                         CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
                         if (crmCustomerTemp != null) {
                             filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
@@ -829,8 +830,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
                     remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
                     filemap.put("remarks", remarks);
-                filemap.put("busSid",busSalesOrder.getSid());
+                    filemap.put("busSid", busSalesOrder.getSid());
-                ResultBean<Map<String,Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
+                    ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
                     checkMap = mapResultBean.getData();
                     //生成新车空白合同
                     checkMap.put("totalPrice", "");
@@ -848,7 +849,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         1000, TimeUnit.MILLISECONDS,
                         new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
                 List<File> filesList = new ArrayList<>();
-            if(!map.isEmpty()){
+                if (!map.isEmpty()) {
                     Future<String> future1 = pool.submit(() -> {
                         return getInvoiceApplyFile(map);
                     });
@@ -857,7 +858,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                         filesList.add(file);
                     }
                 }
-            if(!carMap.isEmpty()){
+                if (!carMap.isEmpty()) {
                     Future<String> future2 = pool.submit(() -> {
                         return getCarFile(carMap);
                     });
@@ -867,7 +868,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                     }
                 }
                 Map<String, Object> finalCheckMap = checkMap;
-            if(!finalCheckMap.isEmpty()){
+                if (!finalCheckMap.isEmpty()) {
                     Future<String> future3 = pool.submit(() -> {
                         return blackFile(finalCheckMap);
                     });
@@ -878,21 +879,18 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
 
 
-
-
-
-
                 if (filesList.size() > 0) {
                     String typeName = contractNo + "开票附件.pdf";
                     File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
                     System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
-                fileUrl =typeName;
+                    fileUrl = typeName;
                 }
 
             } catch (Exception e) {
                 e.printStackTrace();
                 log.error("生成文件失败：==========================" + e.getMessage());
             }
+        }
 
         return fileUrl;
     }