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

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

@@ -168,7 +168,8 @@ public class OrderChildLoanComponent {
         param.setOrderChildPrice(subtract.negate());
         param.setOwnerUserNo(ownerLoanAccount.getOwnerUserNo());
         param.setChildNo(childNo);
-        getLoanBalanceLock(param, ownerLoanRecordService.getLoanBalance(param));
+
+        getLoanBalanceLock(param);
 
 
     }
@@ -205,7 +206,7 @@ public class OrderChildLoanComponent {
             param.setOrderChildPrice(settlementOwnerDetail.getSettlementFreight());
             param.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
             param.setChildNo(childNo);
-            getLoanBalanceLock(param, ownerLoanRecordService.getLoanBalance(param));
+            getLoanBalanceLock(param);
             //TODO 钱不够需要流程卡死
             runningWaterRecordList = ownerLoanAccountRunningWaterRecordDao.getListByOrderNoAndRunningWaterType
                     (childNo, OwnerLoanAccountRunningWaterRecordEnum.RunWaterType.APPROVE_FROZEN.getCode());
@@ -241,7 +242,7 @@ public class OrderChildLoanComponent {
                 param.setOrderChildPrice(subtract.negate());
                 param.setOwnerUserNo(settlementOwnerDetail.getOwnerUserNo());
                 param.setChildNo(childNo);
-                getLoanBalanceLock(param, ownerLoanRecordService.getLoanBalance(param));
+                getLoanBalanceLock(param);
 
                 //TODO 钱不够需要流程卡死
 
@@ -372,7 +373,7 @@ public class OrderChildLoanComponent {
 
     }
 
-    public void getLoanBalanceLock(LoanBalanceDTO dto, Consumer<LoanBalanceDTO> function) {
+    public void getLoanBalanceLock(LoanBalanceDTO dto) {
         RLock lock = null;
         try {
             lock = redissonClient.getLock(RedissonConstants.ORDER_CHILD_LOAN_OWNER_USERID_LOCK + dto.getOwnerUserNo());
@@ -382,7 +383,7 @@ public class OrderChildLoanComponent {
                 throw new ServiceSystemException(PerformanceResultEnum.GET_LOAN_RECORD);
             }
 
-            function.accept(dto);
+            ownerLoanRecordService.getLoanBalance(dto);
         } catch (Exception e) {
             throw new ServiceSystemException(PerformanceResultEnum.GET_LOAN_RECORD, e.getMessage());
         } finally {

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

@@ -336,7 +336,7 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Consumer<LoanBalanceDTO> getLoanBalance(LoanBalanceDTO param) {
+    public void getLoanBalance(LoanBalanceDTO param) {
         BigDecimal orderChildPrice = param.getOrderChildPrice();
         Long userNo = param.getOwnerUserNo();
         String childNo = param.getChildNo();
@@ -377,7 +377,6 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
             log.info("借款产生异常,异常信息：{}", ExceptionUtils.getThrowableCount(e));
             dataSourceTransactionManager.rollback(transactionStatus);
         }
-        return null;
     }
     public void generateFrozenOwnerLoanRunningWater(OwnerLoanRecord ownerLoanRecord, String childNo, BigDecimal orderChildPrice) {
         log.info("13.生成借款冻结流水");

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

@@ -13,7 +13,7 @@ import com.clx.performance.vo.pc.loan.carrier.OwnerOrderPaymentDetailVO;
 import com.clx.performance.vo.pc.loan.owner.OwnerLoanRecordDetail;
 import com.clx.performance.vo.pc.loan.carrier.CarrierTransferPaymentDetailVO;
 
-import java.util.function.Consumer;
+
 
 /**
  * @author kavin
@@ -39,5 +39,5 @@ public interface OwnerLoanRecordService {
 
     String savePaymentApplicationForm(ExportPaymentApplicationFormParam param);
 
-    Consumer<LoanBalanceDTO> getLoanBalance(LoanBalanceDTO param);
+    void getLoanBalance(LoanBalanceDTO param);
 }