Merge branch 'v20.9_settlement_20240805' into test

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

@@ -1077,9 +1077,18 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                             SettlementOwnerDetailEnum.InvoiceStatus.NO_INVOICE.getCode());
         }
 
+/**
+ *   无需开票+否：未开票
+ *   全部为否：未开票
+ *   无需开票+是 ：部分开票
+ *   无需开票+是+否 ：部分开票
+ *   全部为是：已开票
+ *   全部为无需开票：无需开票
+ */
+        if(list1.isEmpty()){
             if (list2.isEmpty()){
                 if (list3.isEmpty()) {
-                settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
+                    settlementOwner.setInvoiceStatus(settlementOwner.getInvoiceStatus());
                 }
                 else {
                     settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.INVOICED.getCode());
@@ -1093,6 +1102,24 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
                     settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.PART_INVOICE.getCode());
                 }
             }
+        }else{
+            if (list2.isEmpty()){
+                if (list3.isEmpty()) {
+                    settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NO_NEED_INVOICE.getCode());
+                }
+                else {
+                    settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.PART_INVOICE.getCode());
+                }
+            }
+            else {
+                if (list3.isEmpty()) {
+                    settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.NOT_INVOICE.getCode());
+                }
+                else {
+                    settlementOwner.setInvoiceStatus(SettlementOwnerEnum.InvoiceStatus.PART_INVOICE.getCode());
+                }
+            }
+        }
         settlementOwnerDao.updateInvoiceStatus(settlementOwner);
 
     }