Merge branch 'v13.5_update_settlement_driver_20240416' of…

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

@@ -63,12 +63,17 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
         if(!Objects.equals(param.getIds().size(),list.size())){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"所选数据有误，请重新选择");
         }
+        StringBuffer returnMsg = new StringBuffer();
         list.forEach(item-> {
             String msg = settlementMqHandlerService.paySettlementDriver(item);
             if(StringUtils.isNotBlank(msg)){
                 log.warn("结算单对应的的运单编号:{} 进行结算，结算失败，返回结果:{}",item.getChildNo(),msg);
+                returnMsg.append(String.format("运单编号:【%s】结算失败，失败原因:【%s】;",item.getChildNo(),msg));
             }
         });
+        if(StringUtils.isNotEmpty(returnMsg.toString())){
+            throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,returnMsg.toString());
+        }
     }
 
     public static String formatPayMsg(Integer settlementStatus,String payMsg) {