Merge remote-tracking branch 'origin/v10.7_borrowing_and_repayment_20240118'…

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

@@ -14,5 +14,6 @@ public class RedissonConstants {
 
     public static final String ORDER_CHILD_LOAN_RECORD_LOAN_NO_LOCK = "clx-performance:loanRecordApprove:loanNo:";
 
+    public static final String OWNER_LOAN_EVENT_USERID_LOCK = "clx-performance:ownerLoanEvent:ownerUserId:";
 
 }

performance-web/src/main/java/com/clx/performance/event/EventListenerComponent.java

@@ -5,6 +5,7 @@ import cn.hutool.core.exceptions.ExceptionUtil;
 import cn.hutool.json.JSONUtil;
 import com.clx.performance.component.OrderChildLoanComponent;
 import com.clx.performance.constant.RabbitKeyConstants;
+import com.clx.performance.constant.RedissonConstants;
 import com.clx.performance.dao.loan.OrderChildLoanRetryRecordDao;
 import com.clx.performance.dao.loan.OwnerLoanAccountRunningWaterRecordDao;
 import com.clx.performance.dao.loan.OwnerLoanRecordDao;
@@ -12,7 +13,9 @@ import com.clx.performance.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.dao.settle.SettlementDriverDao;
 import com.clx.performance.dao.settle.SettlementDriverDetailDao;
 import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
+import com.clx.performance.dto.LoanBalanceDTO;
 import com.clx.performance.dto.OwnerLoanMqDTO;
+import com.clx.performance.enums.PerformanceResultEnum;
 import com.clx.performance.enums.loan.OwnerLoanAccountRunningWaterRecordEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
@@ -25,8 +28,11 @@ import com.clx.performance.model.settle.SettlementDriverDetail;
 import com.clx.performance.model.settle.SettlementOwnerDetail;
 import com.clx.performance.service.settle.SettlementMqService;
 import com.msl.common.base.Optional;
+import com.msl.common.exception.ServiceSystemException;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -41,6 +47,7 @@ import java.math.BigDecimal;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 @Component
@@ -68,7 +75,7 @@ public class EventListenerComponent {
 
     private final RabbitTemplate rabbitTemplate;
 
-    private final OwnerLoanRecordDao ownerLoanRecordDao;
+    private final RedissonClient redissonClient;
 
 
     @Async
@@ -109,26 +116,43 @@ public class EventListenerComponent {
     public void listen(OwnerLoanEvent event) {
         log.info("OwnerLoanEvent事件执行");
         OwnerLoanMqDTO param = event.getParam();
-        SettlementOwnerDetail settlementOwnerDetail = param.getSettlementOwnerDetail();
-        SettlementDriverDetail settlementDriverDetail = param.getSettlementDriverDetail();
-        OrderChild orderChild = param.getOrderChild();
 
+        RLock lock = null;
         try {
-            //生成借款标识
-            orderChildLoanComponent.childLoanConfirmAfterProcess(settlementDriverDetail, settlementOwnerDetail, orderChild);
+            lock = redissonClient.getLock(RedissonConstants.OWNER_LOAN_EVENT_USERID_LOCK + param.getSettlementOwnerDetail().getOwnerUserNo());
+            boolean flag = lock.tryLock(3, 10, TimeUnit.SECONDS);
+            if (!flag) {
+                throw new ServiceSystemException(PerformanceResultEnum.GET_LOAN_RECORD);
+            }
+
+            SettlementOwnerDetail settlementOwnerDetail = param.getSettlementOwnerDetail();
+            SettlementDriverDetail settlementDriverDetail = param.getSettlementDriverDetail();
+            OrderChild orderChild = param.getOrderChild();
+
+            try {
+                //生成借款标识
+                orderChildLoanComponent.childLoanConfirmAfterProcess(settlementDriverDetail, settlementOwnerDetail, orderChild);
+            } catch (Exception e) {
+                //未借款
+                settlementDriverDetail.setLoanFlag(OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode());
+                applicationEventPublisher.publishEvent(new SettlementUpdateEvent(this, settlementDriverDetail, settlementOwnerDetail));
+                log.error("处理货主借款监听器执行异常,数据为{},异常信息{}", JSONUtil.parse(param), ExceptionUtil.getMessage(e));
+                throw e;
+            }
+            log.info("处理货主借款监听器执行成功");
+            settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
+            settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
+
+            // 发送mq 通过开票标识
+            settlementMqService.invoiceTypeSync(settlementDriverDetail.getChildNo(), settlementDriverDetail.getInvoiceType());
         } catch (Exception e) {
-            //未借款
-            settlementDriverDetail.setLoanFlag(OwnerLoanRecordEnum.LoanFlag.NO_LOAN.getCode());
-            applicationEventPublisher.publishEvent(new SettlementUpdateEvent(this, settlementDriverDetail, settlementOwnerDetail));
-            log.error("处理货主借款监听器执行异常,数据为{},异常信息{}", JSONUtil.parse(param), ExceptionUtil.getMessage(e));
-            throw e;
+            throw new ServiceSystemException(PerformanceResultEnum.GET_LOAN_RECORD, e.getMessage());
+        } finally {
+            if (lock != null && lock.isLocked() && lock.isHeldByCurrentThread()) {
+                lock.unlock();
+            }
         }
-        log.info("处理货主借款监听器执行成功");
-        settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
-        settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
-        // 发送mq 通过开票标识
-        settlementMqService.invoiceTypeSync(settlementDriverDetail.getChildNo(), settlementDriverDetail.getInvoiceType());
     }