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

performance-api/src/main/java/com/clx/performance/vo/pc/carrier/settle/CarrierPageSettlementDriverVO.java

@@ -67,6 +67,9 @@ public class CarrierPageSettlementDriverVO {
     private String createTime;
     @ApiModelProperty(value = "结算平台 1：马上来  2：网运平台")
     private String settlementPlatform;
+    @ApiModelProperty(value = "支付失败原因")
+    private String payErrorMsg;
+
 
 
 

performance-web/src/main/java/com/clx/performance/constant/RedissonConstants.java

@@ -5,6 +5,13 @@ public class RedissonConstants {
     // 接单锁
     public static final String ORDER_CHILD_SAVE_USER_TRUCK_LOCK = "clx-performance:orderChild:save:userTruck:";
     public static final String ORDER_CHILD_SAVE_ORDER_GOODS_NO_LOCK = "clx-performance:orderChild:save:orderGoodsNo:";
+    //货主结算单支付锁
+    public static final String SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:settlementOwner:batchPay:id:";
+    //货主违约结算单支付锁
+    public static final String BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK = "clx-performance:breakContractSettlementOwner:batchPay:id:";
+
+
+
 
 
     //货主结算单支付锁

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

 package com.clx.performance.service.impl.breakcontract;
 
-import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.breakcontract.BreakContractSettlementDriverDao;
 import com.clx.performance.enums.BreakContractSettlementDriverEnum;
 import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
 import com.clx.performance.service.breakcontract.BreakContractJobHandlerService;
 import com.clx.performance.service.payment.PayService;
-import com.clx.performance.utils.RedisUtil;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Objects;
-import java.util.UUID;
 
 @Slf4j
 @Service

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

@@ -134,7 +134,6 @@ public class BreakContractSettlementDriverServiceImpl implements BreakContractSe
             String msg = breakContractJobHandlerService.pay(item.getId());
             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/SettlementDriverServiceImpl.java

@@ -65,7 +65,6 @@ public class SettlementDriverServiceImpl implements SettlementDriverService {
             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

 package com.clx.performance.service.impl.settle;
 
 import com.clx.performance.config.MslPaymentConfig;
-import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.OrderChildDao;
 import com.clx.performance.dao.OrderGoodsDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;