Merge branch 'v10.7_borrowing_and_repayment_20240118' into test

performance-api/src/main/java/com/clx/performance/vo/pc/loan/carrier/CarrierOwnerPaymentVO.java

 package com.clx.performance.vo.pc.loan.carrier;
 
+import com.msl.common.convertor.type.MoneyOutConvert;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -20,6 +21,7 @@ public class CarrierOwnerPaymentVO{
     private Integer id;
    
     @ApiModelProperty("付款金额")
+    @MoneyOutConvert
     private BigDecimal paymentBalance;
 
     @ApiModelProperty("付款方")

performance-web/src/main/java/com/clx/performance/component/OrderChildLoanComponent.java

@@ -250,7 +250,7 @@ public class OrderChildLoanComponent {
 
         } else {
             BigDecimal alterationBalance = runningWaterRecordList.stream().map(OwnerLoanAccountRunningWaterRecord::getAlterationBalance).reduce(BigDecimal.ZERO, BigDecimal::add);
-
+            runningWaterRecordList = listMap.get(OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
             if (alterationBalance.compareTo(settlementOwnerDetail.getSettlementFreight()) == 0) {
                 log.info("4.2 相等直接生成运单核销");
                 //相等直接生成运单核销

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementServiceImpl.java

@@ -16,6 +16,7 @@ import com.clx.performance.enums.settle.SettlementDriverEnum;
 import com.clx.performance.enums.settle.SettlementOwnerDetailEnum;
 import com.clx.performance.enums.settle.SettlementOwnerEnum;
 import com.clx.performance.enums.settle.SettlementWayEnum;
+import com.clx.performance.event.OwnerLoanThawEvent;
 import com.clx.performance.model.OrderChild;
 import com.clx.performance.model.OwnerAccount;
 import com.clx.performance.model.OwnerRunningWaterRecord;
@@ -28,6 +29,7 @@ import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -55,6 +57,9 @@ public class SettlementServiceImpl implements SettlementService {
     @Autowired
     private RabbitTemplate rabbitTemplate;
 
+    @Autowired
+    private ApplicationEventPublisher applicationEventPublisher;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -102,6 +107,8 @@ public class SettlementServiceImpl implements SettlementService {
         settlementOwnerDetailDao.updateInvoiceType(settlementOwnerDetail);
         settlementDriverDetailDao.updateInvoiceTypeAndPrepayFreightFlag(settlementDriverDetail);
 
+        //普通单解冻
+        applicationEventPublisher.publishEvent(new OwnerLoanThawEvent(this, childNo));
         // 发送mq 通过开票标识
         settlementMqService.invoiceTypeSync(childNo, invoiceType);