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

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -43,6 +44,7 @@ public class OwnerLoanAccountThawListener {
     private final OwnerLoanAccountRunningWaterRecordDao ownerLoanAccountRunningWaterRecordDao;
 
     @RabbitListener(queues = RabbitKeyConstants.OWNER_LOAN_THAW_QUEUE)
+    @Transactional(rollbackFor = Exception.class)
     public void onMessage(String message) {
         log.info("货主借款冻结释放监听器{}", message);
         List<OwnerLoanAccountRunningWaterRecord> runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByChildNoAndRunningWaterType(message);
@@ -69,7 +71,7 @@ public class OwnerLoanAccountThawListener {
             String childNo = record.getChildNo();
             BigDecimal balance = record.getAlterationBalance();
             //解冻借款
-            orderChildLoanComponent.thawOwnerLoanAccount(loanNo, loanType, ownerUserNo, record.getMobile(), ownerUserName, childNo, balance);
+            orderChildLoanComponent.thawOwnerLoanAccount(loanNo, loanType, ownerUserNo, ownerUserName, record.getMobile(), childNo, balance);
         }
     }
 }

performance-web/src/main/java/com/clx/performance/mapper/loan/OwnerLoanRecordMapper.java

@@ -25,7 +25,7 @@ public interface OwnerLoanRecordMapper extends BaseMapper<OwnerLoanRecord> {
     IPage<OwnerLoanRecordVO> pageByParam(@Param("page") Page<OwnerLoanRecordVO> page, @Param("param") PageOwnerLoanRecordOfOwner param);
 
 
-    @Update("update owner_loan_record set loan_residue_balance = loan_residue_balance + #{loanResidueBalance}" +
+    @Update("update owner_loan_record set loan_residue_balance = loan_residue_balance + #{account.loanResidueBalance}" +
            ",modified_time=#{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )

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

@@ -90,6 +90,8 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
 //        // 结算金额
 //        settlementOwnerDetail.setSettlementFreight(settlementFreightCalc(orderGoods.getSettlementWay(),settlementOwnerDetail));
 //
+        //借款抵扣金额初始化
+        settlementOwnerDetail.setLoanFreight(BigDecimal.ZERO);
 
         settlementOwnerDetail.setFinalPaymentStatus(SettlementOwnerDetailEnum.FinalPaymentStatus.NO.getCode());
         settlementOwnerDetailDao.saveEntity(settlementOwnerDetail);