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

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

@@ -70,7 +70,8 @@ public class EventListenerComponent {
     private final RabbitTemplate rabbitTemplate;
 
 
-    @EventListener(classes = {SettlementUpdateEvent.class})
+    @Async
+    @TransactionalEventListener(classes = {SettlementUpdateEvent.class},phase = TransactionPhase.AFTER_ROLLBACK,fallbackExecution = true)
     public void listen(SettlementUpdateEvent event) {
         log.info("SettlementUpdateEvent事件执行");
         SettlementOwnerDetail settlementOwnerDetail = event.getSettlementOwnerDetail();

performance-web/src/main/java/com/clx/performance/listener/OwnerLoanAccountThawListener.java

@@ -52,15 +52,7 @@ public class OwnerLoanAccountThawListener {
         if (CollectionUtil.isEmpty(runningWaterRecordList)) {
             return;
         }
-        Map<Integer, List<OwnerLoanAccountRunningWaterRecord>> listMap = runningWaterRecordList.stream().collect(Collectors.groupingBy(OwnerLoanAccountRunningWaterRecord::getRunningWaterType));
 
-        List<OwnerLoanAccountRunningWaterRecord> thawRecord = listMap.get(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_THAW.getCode());
-        if (CollectionUtil.isNotEmpty(thawRecord)) {
-            log.info("3.1 有借款解冻记录,说明是是重复记录,直接返回");
-            return;
-        } else {
-            runningWaterRecordList = listMap.get(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
-        }
         Long ownerUserNo = runningWaterRecordList.get(0).getOwnerUserNo();
         log.info("当前解冻货主：{},流水记录长度{},流水记录{}", ownerUserNo, runningWaterRecordList.size(), JSONUtil.parse(runningWaterRecordList));
 

performance-web/src/main/java/com/clx/performance/service/impl/loan/OwnerLoanRecordServiceImpl.java

@@ -530,9 +530,6 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
 
         if (orderChildPriceTemp.compareTo(BigDecimal.ZERO) != 0) {
             //当前钱不够,需要记录,流程卡死,不往下走
-            log.info("当前运单货款不足,运单号{},开始执行解冻操作", childNo);
-            applicationEventPublisher.publishEvent(new OwnerLoanThawEvent(this, childNo));
-
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "执行借款发现：货主货款不足");
         }