确认收货处理相关借款逻辑

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

@@ -41,6 +41,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -180,6 +181,7 @@ public class OrderChildLoanComponent {
      * @param settlementDriverDetail
      * @param settlementOwnerDetail
      */
+    @Transactional(rollbackFor = Exception.class)
     public void childLoanConfirmAfterProcess(SettlementDriverDetail settlementDriverDetail, SettlementOwnerDetail settlementOwnerDetail) {
         log.info("1.运单确认收货后借款相关处理执行");
         if (SettlementOwnerEnum.InvoiceType.ORDINARY.getCode().equals(settlementDriverDetail.getInvoiceType())) {
@@ -206,8 +208,11 @@ public class OrderChildLoanComponent {
             param.setOrderChildPrice(settlementOwnerDetail.getSettlementFreight());
             param.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
             param.setChildNo(childNo);
-            getLoanBalanceLock(param);
+            param.setSettlementDriverDetail(settlementDriverDetail);
+            param.setSettlementOwnerDetail(settlementOwnerDetail);
             //TODO 钱不够需要流程卡死
+            getLoanBalanceLock(param);
+
             runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByOrderNoAndRunningWaterType
                     (childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
             childWriteOffOwnerLoanAccount(runningWaterRecordList);
@@ -242,9 +247,10 @@ public class OrderChildLoanComponent {
                 param.setOrderChildPrice(subtract.negate());
                 param.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
                 param.setChildNo(childNo);
-                getLoanBalanceLock(param);
-
+                param.setSettlementDriverDetail(settlementDriverDetail);
+                param.setSettlementOwnerDetail(settlementOwnerDetail);
                 //TODO 钱不够需要流程卡死
+                getLoanBalanceLock(param);
 
                 runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByOrderNoAndRunningWaterType
                         (childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementDriverDetailDaoImpl.java

@@ -31,6 +31,7 @@ public class SettlementDriverDetailDaoImpl extends BaseDaoImpl<SettlementDriverD
                 .set(SettlementDriverDetail::getInvoiceType, item.getInvoiceType())
                 .set(SettlementDriverDetail::getPrepayFreight, item.getPrepayFreight())
                 .set(SettlementDriverDetail::getPrepayFreightFlag, item.getPrepayFreightFlag())
+                .set(SettlementDriverDetail::getLoanFlag, item.getLoanFlag())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dao/impl/settle/SettlementOwnerDetailDaoImpl.java

@@ -36,6 +36,7 @@ public class SettlementOwnerDetailDaoImpl extends BaseDaoImpl<SettlementOwnerDet
                 .set(SettlementOwnerDetail::getSettlementFreight, item.getSettlementFreight())
                 .set(SettlementOwnerDetail::getFinalPaymentStatus, item.getFinalPaymentStatus())
                 .set(SettlementOwnerDetail::getPrepayFreight, item.getPrepayFreight())
+                .set(SettlementOwnerDetail::getLoanFreight, item.getLoanFreight())
         );
     }
 

performance-web/src/main/java/com/clx/performance/dto/LoanBalanceDTO.java

 package com.clx.performance.dto;
 
+import com.clx.performance.model.settle.SettlementDriverDetail;
+import com.clx.performance.model.settle.SettlementOwnerDetail;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,4 +14,8 @@ public class LoanBalanceDTO {
     private Long ownerUserNo;
 
     private String childNo;
+
+    private SettlementDriverDetail settlementDriverDetail;
+
+    private SettlementOwnerDetail settlementOwnerDetail;
 }

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

@@ -397,6 +397,8 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         }
 
         if (orderChildPriceTemp.compareTo(BigDecimal.ZERO) != 0) {
+            //当前钱不够,需要记录,流程卡死,不往下走
+
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "执行借款发现：货主货款不足");
         }