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

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

 package com.clx.performance.service.impl.loan;
 
-import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.clx.performance.component.OrderChildLoanComponent;
-import com.clx.performance.constant.RabbitKeyConstants;
-import com.clx.performance.dao.OrderChildDao;
-import com.clx.performance.dao.loan.*;
-import com.clx.performance.dao.settle.SettlementDriverDetailDao;
-import com.clx.performance.dao.settle.SettlementOwnerDetailDao;
-import com.clx.performance.dto.OwnerLoanMqDTO;
+import com.clx.performance.dao.loan.BankTradeDao;
+import com.clx.performance.dao.loan.OwnerLoanAccountDao;
+import com.clx.performance.dao.loan.OwnerLoanRecordDao;
+import com.clx.performance.dao.loan.OwnerRepaymentDao;
 import com.clx.performance.enums.OwnerAccountEnum;
 import com.clx.performance.enums.loan.BankTradeEnum;
-import com.clx.performance.enums.loan.OwnerLoanAccountApproveEnum;
 import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
-import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.clx.performance.extranal.user.OwnerInfoService;
-import com.clx.performance.model.OrderChild;
-import com.clx.performance.model.breakcontract.BreakContractSettlementDriver;
-import com.clx.performance.model.loan.*;
-import com.clx.performance.model.settle.SettlementDriverDetail;
-import com.clx.performance.model.settle.SettlementOwnerDetail;
+import com.clx.performance.model.loan.BankTrade;
+import com.clx.performance.model.loan.OwnerLoanAccount;
+import com.clx.performance.model.loan.OwnerLoanRecord;
+import com.clx.performance.model.loan.OwnerRepayment;
 import com.clx.performance.param.pc.loan.carrier.OwnerRepaymentParam;
 import com.clx.performance.param.pc.loan.carrier.PageOwnerLoanAccountParam;
 import com.clx.performance.service.loan.OwnerLoanAccountService;
@@ -33,18 +26,13 @@ import com.msl.common.base.Optional;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.user.data.UserSessionData;
 import com.msl.user.utils.TokenUtil;
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.core.MessageBuilder;
-import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * @author kavin

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

@@ -35,6 +35,7 @@ import com.clx.performance.enums.loan.OwnerLoanRecordEnum;
 import com.clx.performance.enums.loan.OwnerRePaymentEnum;
 import com.clx.performance.enums.nbbank.NbBankStatusEnum;
 import com.clx.performance.event.OwnerLoanEvent;
+import com.clx.performance.event.OwnerLoanThawEvent;
 import com.clx.performance.extranal.user.impl.OwnerInfoServiceImpl;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OwnerBindCardRecord;
@@ -520,6 +521,8 @@ 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, "执行借款发现：货主货款不足");
         }