Merge branch 'refs/heads/v20.9_settlement_20240805' into test

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDaoImpl.java

@@ -95,6 +95,14 @@ public class SettlementOwnerDaoImpl extends BaseDaoImpl<SettlementOwnerMapper, S
         );
     }
     @Override
+    public boolean updateInvoiceStatusAndStatus(SettlementOwner item){
+        return update(lUdWrapper()
+                .eq(SettlementOwner::getId, item.getId())
+                .set(SettlementOwner::getInvoiceStatus, item.getInvoiceStatus())
+                .set(SettlementOwner::getStatus, item.getStatus())
+        );
+    }
+    @Override
     public boolean updatePayment(SettlementOwner settlementOwner) {
         return update(lUdWrapper()
                 .eq(SettlementOwner::getSettlementNo, settlementOwner.getSettlementNo())

performance-web/src/main/java/com/clx/performance/dao/settle/SettlementOwnerDao.java

@@ -29,6 +29,8 @@ public interface SettlementOwnerDao extends BaseDao<SettlementOwnerMapper, Settl
 
     boolean updateInvoiceStatusById(@Param("id")Integer id, @Param("invoiceStatus")Integer invoiceStatus);
 
+    boolean updateInvoiceStatusAndStatus(SettlementOwner item);
+
     boolean updatePayment(SettlementOwner settlementOwner);
 
 

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

@@ -582,6 +582,7 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
 
     }
 
+    @Deprecated
     @Override
     public void saveExpress(SaveExpressParam param){
         String settlementNo = param.getSettlementNo();
@@ -688,7 +689,21 @@ public class SettlementOwnerServiceImpl  implements SettlementOwnerService {
                 networkSyncComponent.ownerSettlementSync(settlementOwner,settlementOwnerDetailList);
 
             }else{
-                settlementOwnerDao.updateStatusBySettlementNo(settlementNo,SettlementOwnerEnum.Status.COMPLETED.getCode());
+                if(Objects.equals(settlementOwner.getInvoiceType(),SettlementOwnerEnum.InvoiceType.ORDINARY.getCode())){
+                    int invoiceStatus;
+                    int detailInvoiceStatus;
+                    if(settlementOwner.getInvoiceFreight().compareTo(BigDecimal.ZERO) > 0 ){ //结算单开票金额>0结算单填写发票物流单号以后，更新状态为“是”
+                        invoiceStatus = SettlementOwnerEnum.InvoiceStatus.INVOICED.getCode();
+                        detailInvoiceStatus =  SettlementOwnerDetailEnum.InvoiceStatus.YES.getCode();
+                    }else{  //结算单开票金额<=0的结算单，货主确认结算单后，更新状态为“无需开票”
+                        invoiceStatus = SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode();
+                        detailInvoiceStatus =  SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode();
+                    }
+                    settlementOwner.setInvoiceStatus(invoiceStatus);
+                    settlementOwnerDetailDao.updateInvoiceStatusBySettlementNo(settlementNo, detailInvoiceStatus);
+                }
+                settlementOwner.setStatus(SettlementOwnerEnum.Status.COMPLETED.getCode());
+                settlementOwnerDao.updateInvoiceStatusAndStatus(settlementOwner);
             }
         }