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

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

@@ -67,7 +67,6 @@ public class EventListenerComponent {
         log.info("SettlementUpdateEvent事件执行");
         SettlementOwnerDetail settlementOwnerDetail = event.getSettlementOwnerDetail();
         SettlementDriverDetail settlementDriverDetail = event.getSettlementDriverDetail();
-        log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
         Integer ownerId = settlementOwnerDetail.getId();
@@ -79,6 +78,7 @@ public class EventListenerComponent {
             entity.setSettlementOwnerId(ownerId);
             entity.setSettlementDriverId(driverId);
             entity.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
+            log.info("当前货主结算信息{},车主结算信息：{}", JSONUtil.parse(settlementOwnerDetail), JSONUtil.parse(settlementDriverDetail));
             // 保存重试记录
             orderChildLoanRetryRecordDao.saveEntity(entity);
         }

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

@@ -734,9 +734,9 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         }
         if (OwnerLoanRecordEnum.LoanType.FUND.getCode().equals(ownerLoanRecord.getLoanType())) {
             log.info("借款记录取消，更新状态为待审批");
-            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
-        } else {
             ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.PAY_WAIT.getCode());
+        } else {
+            ownerLoanRecord.setStatus(OwnerLoanRecordEnum.Status.APPROVE_WAIT.getCode());
 
         }