Merge branch 'v30.6_order_quote_20241022' into test_jdk17

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

@@ -1159,7 +1159,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
 
         SettlementOrderChildRisk settlementOrderChildRisk = settlementOrderChildRiskDao
-                .findLastByChildNo(childNo).orElseThrow(ResultEnum.DATA_NOT_FIND);
+                .findLastByChildNo(childNo).orNull();
         if (settlementOrderChildRisk != null){
             // 网运单转普通单
             orderChildSyncTransportListener.extracted(orderChild, settlementOwnerDetail, settlementDriverDetail, settlementOwnerDetail.getInvoiceType(), settlementOrderChildRisk.getRiskRemark());