优化

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -440,7 +440,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
             //首次认款
             List<FinSelectedReceivablesDetailedDto> finSelectedReceivablesDetailedDtos = dto.getFinSelectedReceivablesDetaileds();
             BigDecimal subscriptionMoneyAll = finSelectedReceivablesDetailedDtos.stream().map(FinSelectedReceivablesDetailedDto::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
-            if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney())?new BigDecimal(dto.getCollectionMoney()):BigDecimal.ZERO) != 0) {
+            if (subscriptionMoneyAll.compareTo(StringUtils.isNotBlank(dto.getCollectionMoney()) ? new BigDecimal(dto.getCollectionMoney()) : BigDecimal.ZERO) != 0) {
                 return rb.setMsg("认款总额与收款金额不符");
             }
             List<FinCollectionConfirmationAppendixDto> paymentVoucherAppendixs = dto.getPaymentVoucherAppendixs();
@@ -1652,13 +1652,14 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
         //判断加装配置手续费推送应收单
         for (FinSelectedReceivablesDetailedVo finSelectedReceivablesDetailedVo : finSelectedReceivablesDetailedVos) {
-            if ("加装配置手续费".equals(finSelectedReceivablesDetailedVo.getReceivablesName())){
+            if ("加装配置手续费".equals(finSelectedReceivablesDetailedVo.getReceivablesName())) {
                 BusValcustFiling busValcustFiling = busValcustFilingFeign.selectByContractNoAndVinNo(finSelectedReceivablesDetailedVo.getContractNo(), finSelectedReceivablesDetailedVo.getVIN()).getData();
-                if (busValcustFiling.getBusSource().equals("0")){//单独开票
+                if (busValcustFiling.getBusSource().equals("0")) {//单独开票
                     FinBillApplication finBillApplication = finBillApplicationService.fetchBySid(busValcustFiling.getBusSid());
                     List<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(finBillApplication.getSid());
                     List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(finBillApplication.getSid());
                     for (FinBillVehicleVo finBillVehicleVo : finBillVehicleVos) {
+                        if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillVehicleVo.getVinNo().substring(finBillVehicleVo.getVinNo().length() - 8))) {
                             int count = finVehicleInvoiceService.selectCountByVinSid(finBillVehicleVo.getVehSid());
                             if (count == 0) {
                                 FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
@@ -1679,10 +1680,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceDto.setInvoicingName(finBillVehicleVo.getOpenTickName());
                                 finVehicleInvoiceDto.setCreateBySid(finBillApplication.getCreateBySid());
                                 BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(finBillVehicleVo.getVehSid()).getData();
-                            if (busArrearsCarryVehicleApplyVo == null){
+                                if (busArrearsCarryVehicleApplyVo == null) {
                                     finVehicleInvoiceDto.setBusinessStateKey(finBillApplication.getBillStateKey());
                                     finVehicleInvoiceDto.setBusinessState(finBillApplication.getBillStateValue());
-                            }else {
+                                } else {
                                     finVehicleInvoiceDto.setBusinessStateKey("005");
                                     finVehicleInvoiceDto.setBusinessState("欠款提车");
                                 }
@@ -1703,8 +1704,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                             }
                         }
+                    }
                     if (finBillTrailerVos != null) {
                         for (FinBillTrailerVo finBillTrailerVo : finBillTrailerVos) {
+                            if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(finBillTrailerVo.getVinNo().substring(finBillTrailerVo.getVinNo().length() - 8))) {
                                 String gcVinNo = finBillTrailerVo.getGcVinNo();
                                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                                 int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
@@ -1746,11 +1749,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 }
                             }
                         }
-                }else {//出库开票申请
+                    }
+                } else {//出库开票申请
                     BusBillApplication busBillApplication = busBillApplicationFeign.fetchBySid(busValcustFiling.getBusSid()).getData();
                     List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleFeign.fetchVehBySid(busBillApplication.getSid()).getData();
                     List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerFeign.fetchByMainSid(busBillApplication.getSid()).getData();
                     for (BusBillVehicleVo busBillVehicleVo : busBillVehicleVos) {
+                        if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillVehicleVo.getVinNo().substring(busBillVehicleVo.getVinNo().length() - 8))) {
                             int count = finVehicleInvoiceService.selectCountByVinSid(busBillVehicleVo.getVehSid());
                             if (count == 0) {
                                 FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
@@ -1771,10 +1776,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceDto.setInvoicingName(busBillVehicleVo.getOpenTickName());
                                 finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
                                 BusArrearsCarryVehicleApplyVo busArrearsCarryVehicleApplyVo = busArrearsCarryVehicleApplyFeign.selComByVehSid(busBillVehicleVo.getVehSid()).getData();
-                            if (busArrearsCarryVehicleApplyVo == null){
+                                if (busArrearsCarryVehicleApplyVo == null) {
                                     finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
                                     finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
-                            }else {
+                                } else {
                                     finVehicleInvoiceDto.setBusinessStateKey("005");
                                     finVehicleInvoiceDto.setBusinessState("欠款提车");
                                 }
@@ -1795,8 +1800,10 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                                 finVehicleInvoiceService.mySave(finVehicleInvoiceDto);
                             }
                         }
+                    }
                     if (busBillTrailerVos != null) {
                         for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
+                            if (finSelectedReceivablesDetailedVo.getVIN().substring(finSelectedReceivablesDetailedVo.getVIN().length() - 8).equals(busBillTrailerVo.getVinNo().substring(busBillTrailerVo.getVinNo().length() - 8))) {
                                 String gcVinNo = busBillTrailerVo.getGcVinNo();
                                 BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(gcVinNo).getData();
                                 int count = finVehicleInvoiceService.selectCountByVinSid(baseTrailerDetailsVo.getSid());
@@ -1841,6 +1848,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     }
                 }
             }
+        }
         return rb.success().setMsg("款项确认成功");
     }