Merge remote-tracking branch 'origin/v12.8_bug_settlementJob_20240329' into test

performance-web/src/main/java/com/clx/performance/listener/OrderChildDtsListener.java

@@ -69,7 +69,10 @@ public class OrderChildDtsListener  {
             }else if(Objects.equals(DtsOperationTypeEnum.UPDATE.getCode(),dataTransportDTO.getOperationType().getCode())){
                 log.info("修改:{}",after);
                 if(OrderChildEnum.SYNC_STATUS_lIST.contains(after.getStatus()) &&
-                        (!Objects.equals(before.getStatus(),after.getStatus()) || !Objects.equals(before.getLoadNet(),after.getLoadNet()))){
+                        (!Objects.equals(before.getStatus(),after.getStatus()) ||
+                         !Objects.equals(before.getLoadNet(),after.getLoadNet())) ||
+                         !Objects.equals(before.getUnloadNet(),after.getUnloadNet())
+                        ){
                     orderChildChangeAfter(after);
                 }
                 if(OrderChildEnum.DTS_LISTEN_CANCEL_lIST.contains(after.getStatus())){

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

@@ -117,6 +117,10 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
             log.info("当前车主计费信息开票金额为空,需要重新处理计算开票金额");
             OrderChild orderChild = orderChildDao.getByChildNo(mq.getChildNo()).get();
             settlementOwnerDetail.setInvoiceFreight(invoiceFreightCalc(orderChild.getSettlementWay(), settlementOwnerDetail));
+            SettlementOwnerDetail update = new SettlementOwnerDetail();
+            update.setId(settlementOwnerDetail.getId());
+            update.setInvoiceFreight(settlementOwnerDetail.getInvoiceFreight());
+            settlementOwnerDetailDao.updateEntityByKey(update);
         }
         String settlementNo = null ;
         SettlementOwner settlementOwner = null;