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

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

@@ -156,10 +156,10 @@ public class EventListenerComponent {
     @EventListener(classes = {OrderChildCancelEvent.class})
     public void listen(OrderChildCancelEvent event) {
         log.info("OrderChildCancelEvent事件执行");
-        List<String> childNoList = event.getChildNoList();
-        log.info("需要解冻借款的的运单号:{}", JSONUtil.parse(childNoList));
+        String childNo = event.getChildNo();
+        log.info("需要解冻借款的的运单号:{}", childNo);
 
-        List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(childNoList, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
+        List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
 
         if (CollectionUtil.isEmpty(runningWaterRecordList)) {
             return;
@@ -172,7 +172,6 @@ public class EventListenerComponent {
             Long loanNo = record.getLoanNo();
             Integer loanType = record.getLoanType();
             String ownerUserName = record.getOwnerUserName();
-            String childNo = record.getChildNo();
             BigDecimal balance = record.getAlterationBalance();
             //解冻借款
             orderChildLoanComponent.thawOwnerLoanAccount(loanNo, loanType, ownerUserNo, record.getMobile(), ownerUserName, childNo, balance);