合同

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());
@@ -878,10 +879,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 }
 
 
-
-
-
-
                 if (filesList.size() > 0) {
                     String typeName = contractNo + "开票附件.pdf";
                     File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
@@ -893,6 +890,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 e.printStackTrace();
                 log.error("生成文件失败：==========================" + e.getMessage());
             }
+        }
 
         return fileUrl;
     }