结算单状态变更

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

@@ -27,6 +27,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -186,34 +187,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
      */
     private void settlementPeriodMonthUpdate(SettlementOwner settlementOwner, SettlementOwnerDetail settlementOwnerDetail){
 
-        BigDecimal weight = settlementOwnerDetail.getWeight();
-        BigDecimal freight = settlementOwnerDetail.getFreight();
-        BigDecimal lossWeight = settlementOwnerDetail.getLossWeight();
-        BigDecimal lossFreight = settlementOwnerDetail.getLossFreight();
-        BigDecimal prepayFreight = settlementOwnerDetail.getPrepayFreight();
-        BigDecimal settlementFreight = settlementOwnerDetail.getSettlementFreight();
-        BigDecimal invoiceFreight = settlementOwnerDetail.getInvoiceFreight();
+        settlementOwner.setWeight(settlementOwnerDetail.getWeight());
+        settlementOwner.setFreight(settlementOwnerDetail.getFreight());
+        settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
+        settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
+        settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
+        settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
 
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
 
-        details.stream().forEach(item->{
-            weight.add(item.getWeight());
-            freight.add(item.getFreight());
-            lossWeight.add(item.getLossWeight());
-            lossFreight.add(item.getLossFreight());
-            prepayFreight.add(item.getPrepayFreight());
-            settlementFreight.add(item.getSettlementFreight());
-            invoiceFreight.add(item.getInvoiceFreight());
+        details.forEach(item->{
+            settlementOwner.setWeight(settlementOwnerDetail.getWeight().add(item.getWeight()));
+            settlementOwner.setFreight(settlementOwnerDetail.getFreight().add(item.getFreight()));
+            settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight().add(item.getLossWeight()));
+            settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight().add(item.getLossFreight()));
+            settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight().add(item.getPrepayFreight()));
+            settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight().add(item.getSettlementFreight()));
+            settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight().add(item.getInvoiceFreight()));
         });
 
-        settlementOwner.setWeight(weight);
-        settlementOwner.setFreight(freight);
-        settlementOwner.setLossWeight(lossWeight);
-        settlementOwner.setLossFreight(lossFreight);
-        settlementOwner.setPrepayFreight(prepayFreight);
-        settlementOwner.setSettlementFreight(settlementFreight);
-        settlementOwner.setInvoiceFreight(invoiceFreight);
-
         settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
     }
 
@@ -259,34 +252,26 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
      */
     private void settlementPeriodImmediateUpdate(SettlementOwner settlementOwner,SettlementOwnerDetail settlementOwnerDetail){
 
-        BigDecimal weight = settlementOwnerDetail.getWeight();
-        BigDecimal freight = settlementOwnerDetail.getFreight();
-        BigDecimal lossWeight = settlementOwnerDetail.getLossWeight();
-        BigDecimal lossFreight = settlementOwnerDetail.getLossFreight();
-        BigDecimal prepayFreight = settlementOwnerDetail.getPrepayFreight();
-        BigDecimal settlementFreight = settlementOwnerDetail.getSettlementFreight();
-        BigDecimal invoiceFreight = settlementOwnerDetail.getInvoiceFreight();
+        settlementOwner.setWeight(settlementOwnerDetail.getWeight());
+        settlementOwner.setFreight(settlementOwnerDetail.getFreight());
+        settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight());
+        settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight());
+        settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight());
+        settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight());
+        settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
 
         List<SettlementOwnerDetail> details = settlementOwnerDetailDao.getBySettlementNo(settlementOwner.getSettlementNo());
 
-        details.stream().forEach(item->{
-            weight.add(item.getWeight());
-            freight.add(item.getFreight());
-            lossWeight.add(item.getLossWeight());
-            lossFreight.add(item.getLossFreight());
-            prepayFreight.add(item.getPrepayFreight());
-            settlementFreight.add(item.getSettlementFreight());
-            invoiceFreight.add(item.getInvoiceFreight());
+        details.forEach(item->{
+            settlementOwner.setWeight(settlementOwnerDetail.getWeight().add(item.getWeight()));
+            settlementOwner.setFreight(settlementOwnerDetail.getFreight().add(item.getFreight()));
+            settlementOwner.setLossWeight(settlementOwnerDetail.getLossWeight().add(item.getLossWeight()));
+            settlementOwner.setLossFreight(settlementOwnerDetail.getLossFreight().add(item.getLossFreight()));
+            settlementOwner.setPrepayFreight(settlementOwnerDetail.getPrepayFreight().add(item.getPrepayFreight()));
+            settlementOwner.setSettlementFreight(settlementOwnerDetail.getSettlementFreight().add(item.getSettlementFreight()));
+            settlementOwner.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight().add(item.getInvoiceFreight()));
         });
 
-        settlementOwner.setWeight(weight);
-        settlementOwner.setFreight(freight);
-        settlementOwner.setLossWeight(lossWeight);
-        settlementOwner.setLossFreight(lossFreight);
-        settlementOwner.setPrepayFreight(prepayFreight);
-        settlementOwner.setSettlementFreight(settlementFreight);
-        settlementOwner.setInvoiceFreight(invoiceFreight);
-
         settlementOwnerDao.updateSettlementPeriodMonth(settlementOwner);
     }