车主结算单批量支付失败后增加支付结果的页面显示

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

@@ -15,7 +15,9 @@ import com.clx.performance.struct.settle.SettlementDriverStruct;
 import com.clx.performance.vo.pc.carrier.settle.CarrierPageSettlementDriverVO;
 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.springframework.stereotype.Service;
 
 import java.util.List;
@@ -26,6 +28,7 @@ import java.util.Objects;
  * Date 2023-10-12
  * Time 09:43
  */
+@Slf4j
 @Service
 @AllArgsConstructor
 public class SettlementDriverServiceImpl implements SettlementDriverService {
@@ -58,6 +61,12 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
         if(!Objects.equals(param.getIds().size(),list.size())){
             throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,"所选数据有误，请重新选择");
         }
-        list.forEach(item-> settlementMqHandlerService.paySettlementDriver(item));
+        list.forEach(item-> {
+            String msg = settlementMqHandlerService.paySettlementDriver(item);
+            if(StringUtils.isNotBlank(msg)){
+                log.warn("结算单对应的的运单编号:{} 进行结算，结算失败，返回结果:{}",item.getChildNo(),msg);
+                throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND,msg);
+            }
+        });
     }
 }

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

@@ -205,7 +205,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     /**
      * 车主结算单自动支付
      */
-    public void paySettlementDriver(SettlementDriverDetail detail){
+    public String paySettlementDriver(SettlementDriverDetail detail){
         DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
         PayParam noCheckPwd = null ;
         if(detail.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0){
@@ -230,6 +230,7 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
 
         Result result = null;
+        String msg  = null;
         try{
             result = paymentService.paymentWallet(noCheckPwd);
         }catch (Exception e){
@@ -237,7 +238,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
         }
         if(Objects.nonNull(result)){
             settlementDriverNotify(detail.getChildNo(),0,result.getMsg());
+            msg = result.getMsg();
         }
+        return msg;
     }
 
     /**

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

@@ -12,6 +12,6 @@ public interface SettlementMqHandlerService {
 
     void settlementDriverNotify(String childNo,Integer payType,String payErrorMsg);
 
-    void paySettlementDriver(SettlementDriverDetail detail);
+    String paySettlementDriver(SettlementDriverDetail detail);
 
 }