优化开票生成合同

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

@@ -1263,13 +1263,16 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 List<FinBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
                 for (FinBillVehicleDto v : finBillVehicles) {
                     BusSalesOrderVehicle busSalesOrderVehicle = baseMapper.selectByBorrowSid(dto.getContractNo(), v.getVehSid());
-                    LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
-                    if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {//登记在挂靠公司
-                        v.setOpenTickSid(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompanySid());
-                        v.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
-                        v.setBillTypeKey(busSalesOrder.getBillingTypeKey());
-                        v.setBillTypeValue(busSalesOrder.getBillingType());
+                    if(StringUtils.isNotBlank(busSalesOrderVehicle.getBorrowerSid())){
+                        LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(busSalesOrderVehicle.getBorrowerSid()).getData();
+                        if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {//登记在挂靠公司
+                            v.setOpenTickSid(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompanySid());
+                            v.setOpenTickName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
+                            v.setBillTypeKey(busSalesOrder.getBillingTypeKey());
+                            v.setBillTypeValue(busSalesOrder.getBillingType());
+                        }
                     }
+
                 }
                 //按开票名称sid分组
                 Map<String, List<FinBillVehicleDto>> groupedByOpenTickSid = finBillVehicles.stream()
@@ -5876,8 +5879,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             e.printStackTrace();
             log.error("生成文件失败：==========================" + e.getMessage());
         }*/
-//        String fileUrl = getFileUrlNew(dto);
-        String fileUrl = "";
+        String fileUrl = getFileUrlNew(dto);
+//        String fileUrl = "";
         return fileUrl;
     }