优化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1775,20 +1775,28 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         if ("2".equals(busSalesOrder.getFinancePlan()) && "1".equals(busSalesOrder.getPayTypeKey())) {
             BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.selectByNoAndVinSid(baseVehicleOutApply.getContractNo(), zcDto.getVinSid()).getData();
             String otherReceivableMoney = finUncollectedReceivablesDetailedFeign.selectByBusVinSid(busSalesOrderVehicle.getSid()).getData();
+            int qtMoney = 0;
+            if (StringUtils.isNotBlank(otherReceivableMoney)){
+                qtMoney = Integer.parseInt(otherReceivableMoney);
+            }
             SolutionsDetailsVo solutionsDetailsVo = loanSolutionsFeign.selectDetails(busSalesOrder.getSid()).getData();
             String serviceAmount = solutionsDetailsVo.getServiceAmount();
-            if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) {
+            int fwfMoney = 0;
+            if (StringUtils.isNotBlank(serviceAmount)){
+                fwfMoney = Integer.parseInt(serviceAmount);
+            }
+            if (qtMoney >  0 && fwfMoney > 0) {
                 collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
                 collectionDetailDtoOne.setUseTo("YT017");
                 collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
                 collectionDetailDtoTwo.setUseTo("YT016");
                 collectionDetailDtoList.add(collectionDetailDtoOne);
                 collectionDetailDtoList.add(collectionDetailDtoTwo);
-            } else if (StringUtils.isNotBlank(otherReceivableMoney) && StringUtils.isBlank(serviceAmount)) {
+            } else if (qtMoney > 0 && fwfMoney == 0) {
                 collectionDetailDtoOne.setExTaxMoney("-" + otherReceivableMoney);
                 collectionDetailDtoOne.setUseTo("YT017");
                 collectionDetailDtoList.add(collectionDetailDtoOne);
-            } else if (StringUtils.isBlank(otherReceivableMoney) && StringUtils.isNotBlank(serviceAmount)) {
+            } else if (qtMoney == 0 && fwfMoney > 0) {
                 collectionDetailDtoTwo.setExTaxMoney(serviceAmount);
                 collectionDetailDtoTwo.setUseTo("YT016");
                 collectionDetailDtoList.add(collectionDetailDtoTwo);