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

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

@@ -5,5 +5,12 @@ 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;
@@ -8,11 +9,16 @@ import com.clx.performance.service.breakcontract.BreakContractJobHandlerService;
 import com.clx.performance.service.payment.PayService;
 import com.msl.common.exception.ServiceSystemException;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 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.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -24,26 +30,42 @@ public class BreakContractJobHandlerServiceImpl implements BreakContractJobHandl
     @Autowired
     private PayService payService;
 
+    @Autowired
+    private RedissonClient redissonClient;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public String pay(Integer settlementId){
+        RLock lock = redissonClient.getLock(RedissonConstants.BREAK_CONTRACT_SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK + settlementId);
+        try{
+            boolean flag = lock.tryLock(15, 30, TimeUnit.SECONDS);
+            if (!flag) {
+                //说明有别的线程发起支付操作
+                return "车主违约结算单支付,支付操作频繁，稍后重试";
+            }
+            String msg = null;
+            BreakContractSettlementDriver breakContractSettlementDriver = breakContractSettlementDriverDao.getEntityByKey(settlementId).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
 
-        String msg = null;
-        BreakContractSettlementDriver breakContractSettlementDriver = breakContractSettlementDriverDao.getEntityByKey(settlementId).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+            if (Objects.equals(breakContractSettlementDriver.getSettleStatus(), BreakContractSettlementDriverEnum.SettleStatus.YES)){
+                return msg;
+            }
 
-        if (Objects.equals(breakContractSettlementDriver.getSettleStatus(), BreakContractSettlementDriverEnum.SettleStatus.YES)){
+            try {
+                pay(breakContractSettlementDriver);
+            }catch (ServiceSystemException e){
+                breakContractSettlementDriver.setPayRemark(e.getMessage());
+                breakContractSettlementDriverDao.updatePayFail(breakContractSettlementDriver);
+                msg = e.getMessage();
+            }
             return msg;
+        }catch(Exception e){
+            log.warn("结算单批量支付上锁失败，结算单ID：{},异常原因:{}", settlementId,ExceptionUtils.getStackTrace(e));
+            throw new ServiceSystemException(PerformanceResultEnum.TRY_LOCK_ERROR);
+        }finally {
+            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
         }
-
-        try {
-            pay(breakContractSettlementDriver);
-        }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/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;
@@ -38,8 +39,13 @@ import com.clx.performance.vo.mq.SettlementDetailInvoiceTypeSyncMqParam;
 import com.clx.user.vo.feign.DriverInfoFeignVo;
 import com.clx.user.vo.feign.OwnerInfoFeignVO;
 import com.msl.common.enums.ResultCodeEnum;
+import com.msl.common.exception.ServiceSystemException;
 import com.msl.common.result.Result;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -48,6 +54,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 @Slf4j
 @Service
@@ -96,6 +103,9 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
     @Autowired
     private OrderChildSyncTransportRecordService childSyncTransportRecordService;
 
+    @Autowired
+    RedissonClient redissonClient;
+
 
 
     @Override
@@ -227,41 +237,56 @@ public class SettlementMqHandlerServiceImpl implements SettlementMqHandlerServic
      * 车主结算单自动支付
      */
     public String paySettlementDriver(SettlementDriverDetail detail){
-        DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
-        PayParam noCheckPwd = null ;
-        if(detail.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0){
-            noCheckPwd = PayParam.builder().from(mslPaymentConfig.getTransportWalletCode())
-                    .to(driverInfoFeignVo.getWalletCode())
-                    .figure(detail.getSettlementFreight().intValue())
-                    .tradeNo(detail.getChildNo())
-                    .tradeId(detail.getChildNo())
-                    .pwd("noCheckPwd")
-                    .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
-                    .build();
-        }else{
-            BigDecimal freight = detail.getSettlementFreight().abs();
-            noCheckPwd = PayParam.builder().from(driverInfoFeignVo.getWalletCode())
-                    .to(mslPaymentConfig.getTransportWalletCode())
-                    .figure(freight.intValue())
-                    .tradeNo(detail.getChildNo())
-                    .tradeId(detail.getChildNo())
-                    .pwd("noCheckPwd")
-                    .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
-                    .build();
-        }
-
-        Result result = null;
-        String msg  = null;
+        RLock lock = redissonClient.getLock(RedissonConstants.SETTLEMENT_OWNER_BATCH_PAY_ID_LOCK + detail.getId());
         try{
-            result = paymentService.paymentWallet(noCheckPwd);
-        }catch (Exception e){
-            settlementDriverNotify(detail.getChildNo(),0,e.getMessage());
-            msg = e.getMessage();
-        }
-        if(Objects.nonNull(result)){
-            settlementDriverNotify(detail.getChildNo(),0,result.getMsg());
+            boolean flag = lock.tryLock(15, 30, TimeUnit.SECONDS);
+            if (!flag) {
+                //说明有别的线程发起支付操作
+                return "车主结算单支付,操作频繁，稍后重试";
+            }
+            DriverInfoFeignVo driverInfoFeignVo = driverService.getDriverInfo(detail.getDriverUserNo()).orElseThrow(ResultCodeEnum.FAIL);
+            PayParam noCheckPwd = null ;
+            if(detail.getSettlementFreight().compareTo(BigDecimal.ZERO) > 0){
+                noCheckPwd = PayParam.builder().from(mslPaymentConfig.getTransportWalletCode())
+                        .to(driverInfoFeignVo.getWalletCode())
+                        .figure(detail.getSettlementFreight().intValue())
+                        .tradeNo(detail.getChildNo())
+                        .tradeId(detail.getChildNo())
+                        .pwd("noCheckPwd")
+                        .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+                        .build();
+            }else{
+                BigDecimal freight = detail.getSettlementFreight().abs();
+                noCheckPwd = PayParam.builder().from(driverInfoFeignVo.getWalletCode())
+                        .to(mslPaymentConfig.getTransportWalletCode())
+                        .figure(freight.intValue())
+                        .tradeNo(detail.getChildNo())
+                        .tradeId(detail.getChildNo())
+                        .pwd("noCheckPwd")
+                        .remark(PayRemarkEnum.toString(PayRemarkEnum.FREIGHT_TO_OWNER.getValue()))
+                        .build();
+            }
+
+            Result result = null;
+            String msg  = null;
+            try{
+                result = paymentService.paymentWallet(noCheckPwd);
+            }catch (Exception e){
+                settlementDriverNotify(detail.getChildNo(),0,e.getMessage());
+                msg = e.getMessage();
+            }
+            if(Objects.nonNull(result)){
+                settlementDriverNotify(detail.getChildNo(),0,result.getMsg());
+            }
+            return msg;
+        }catch(Exception e){
+            log.warn("货主结算单批量支付上锁失败，异常原因:{}", ExceptionUtils.getStackTrace(e));
+            throw new ServiceSystemException(PerformanceResultEnum.TRY_LOCK_ERROR);
+        }finally {
+            if (lock.isLocked() && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
         }
-        return msg;
     }
 
     /**