结算金额=0的运单，是否已付尾款字段都是“无需支付”

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerServiceImpl.java

@@ -110,15 +110,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
             status = SettlementOwnerEnum.Status.SHIPPER_TO_PAYMENT.getCode();
         }else if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) <0){
             status = SettlementOwnerEnum.Status.PLATFORM_TO_PAYMENT.getCode();
-            if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
-                settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
-                settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo,SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
-            }
         }else{
-            if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
-                settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
-                settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo,SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
-            }
             status = SettlementOwnerEnum.Status.COMPLETED.getCode();
             //保存结算单日志----已完结
             settlementLogService.saveSettlementLog(settlementNo,
@@ -126,6 +118,13 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                     OrderChildLogEnum.CreateType.OWNER.getCode(),loginUserInfo.getUserNo(),loginUserInfo.getUserName());
         }
 
+        if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
+            if(settlementOwner.getInvoiceFreight().compareTo(BigDecimal.ZERO) <=0 ){
+                settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
+                settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
+            }
+        }
+
         //更新状态
         settlementOwnerDao.updateStatusBySettlementNo(settlementNo,status);
     }
@@ -364,12 +363,9 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
         settlementOwnerDao.saveExpress(settlementNo,param.getExpressCompany(),param.getExpressNo());
 
         if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
-            if(settlementOwner.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0 ){
+            if(settlementOwner.getInvoiceFreight().compareTo(BigDecimal.ZERO) > 0 ){
                 settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.All_INVOICED.getCode());
                 settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode());
-            }else{
-                settlementOwnerDao.updateInvoiceStatusById(settlementOwner.getId(),SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
-                settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
             }
         }