Merge remote-tracking branch 'origin/v7.6_small_version_fix_20231204' into test

performance-web/src/main/java/com/clx/performance/service/breakcontract/BreakContractJobHandlerService.java

@@ -2,6 +2,6 @@ package com.clx.performance.service.breakcontract;
 
 public interface BreakContractJobHandlerService {
 
-    void pay(Integer settlementId);
+    String pay(Integer settlementId);
 
 }

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractJobHandlerServiceImpl.java

@@ -26,12 +26,13 @@ public class BreakContractJobHandlerServiceImpl implements BreakContractJobHandl
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void pay(Integer settlementId){
+    public String pay(Integer settlementId){
 
+        String msg = null;
         BreakContractSettlementDriver breakContractSettlementDriver = breakContractSettlementDriverDao.getEntityByKey(settlementId).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
         if (Objects.equals(breakContractSettlementDriver.getSettleStatus(), BreakContractSettlementDriverEnum.SettleStatus.YES)){
-            return;
+            return msg;
         }
 
         try {
@@ -39,7 +40,9 @@ public class BreakContractJobHandlerServiceImpl implements BreakContractJobHandl
         }catch (ServiceSystemException e){
             breakContractSettlementDriver.setPayRemark(e.getMessage());
             breakContractSettlementDriverDao.updatePayFail(breakContractSettlementDriver);
+            msg = e.getMessage();
         }
+        return msg;
 
     }
 

performance-web/src/main/java/com/clx/performance/service/impl/breakcontract/BreakContractSettlementDriverServiceImpl.java

@@ -21,6 +21,7 @@ import com.msl.common.exception.ServiceSystemException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.stereotype.Service;
 
@@ -129,8 +130,13 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
                 throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"所选数据有误，请重新选择");
             }
         });
+        list.forEach(item-> {
+            String msg = breakContractJobHandlerService.pay(item.getId());
+            if(StringUtils.isNotBlank(msg)){
+                log.warn("违约结算单对应的的运单编号:{} 进行结算，结算失败，返回结果:{}",item.getChildNo(),msg);
+                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,msg);
+            }
+        });
 
-
-        list.forEach(item->breakContractJobHandlerService.pay(item.getId()));
     }
 }