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

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

 package com.clx.performance.service.impl.loan;
 
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
@@ -471,43 +472,50 @@ public class OwnerLoanRecordServiceImpl implements OwnerLoanRecordService {
         log.info("查询ownerLoanRecords:{}", JSONUtil.parse(ownerLoanRecords));
         Map<Integer, List<OwnerLoanRecord>> listMap = ownerLoanRecords.stream().collect(Collectors.groupingBy(OwnerLoanRecord::getLoanType));
 
-        for (OwnerLoanRecord ownerLoanRecord : listMap.get(OwnerLoanRecordEnum.LoanType.VIRTUAL_CURRENCY.getCode())) {
-            BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
-            log.info("当前借款金额：{},虚拟币借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
-            if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
-                log.info("当前借款单的剩余金额足够借款金额");
-                generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPriceTemp);
-                updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
-                orderChildPriceTemp = BigDecimal.ZERO;
-                break;
-            } else {
-                log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余");
-                generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, loanResidueBalance);
-                updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO));
-                orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance);
+        List<OwnerLoanRecord> verList = listMap.get(OwnerLoanRecordEnum.LoanType.VIRTUAL_CURRENCY.getCode());
+        if (CollectionUtil.isNotEmpty(verList)) {
+            for (OwnerLoanRecord ownerLoanRecord : verList) {
+                BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
+                log.info("当前借款金额：{},虚拟币借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
+                if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
+                    log.info("当前借款单的剩余金额足够借款金额");
+                    generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPriceTemp);
+                    updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
+                    orderChildPriceTemp = BigDecimal.ZERO;
+                    break;
+                } else {
+                    log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余");
+                    generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, loanResidueBalance);
+                    updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO));
+                    orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance);
+                }
+                log.info("当前虚拟币orderChildPriceTemp：{}", orderChildPriceTemp);
             }
-            log.info("当前虚拟币orderChildPriceTemp：{}", orderChildPriceTemp);
         }
 
-        for (OwnerLoanRecord ownerLoanRecord : listMap.get(OwnerLoanRecordEnum.LoanType.FUND.getCode())) {
-            BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
-            log.info("当前借款金额：{},资金借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
-            if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
-                log.info("当前借款单的剩余金额足够借款金额");
-                generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPriceTemp);
-                updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
-                orderChildPriceTemp = BigDecimal.ZERO;
-                break;
-            } else {
-                log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余");
-                generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, loanResidueBalance);
-                updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO));
-                orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance);
+        List<OwnerLoanRecord> fundList = listMap.get(OwnerLoanRecordEnum.LoanType.FUND.getCode());
+        if (CollectionUtil.isNotEmpty(fundList)) {
+            for (OwnerLoanRecord ownerLoanRecord : fundList) {
+                BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
+                log.info("当前借款金额：{},资金借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
+                if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
+                    log.info("当前借款单的剩余金额足够借款金额");
+                    generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPriceTemp);
+                    updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
+                    orderChildPriceTemp = BigDecimal.ZERO;
+                    break;
+                } else {
+                    log.info("当前借款单的剩余金额不够抵扣借款金额,先进行扣除当前借款所有剩余");
+                    generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, loanResidueBalance);
+                    updateList.add(ownerLoanRecord.setLoanResidueBalance(BigDecimal.ZERO));
+                    orderChildPriceTemp = orderChildPriceTemp.subtract(loanResidueBalance);
+                }
+                log.info("当前资金orderChildPriceTemp：{}", orderChildPriceTemp);
             }
-            log.info("当前资金orderChildPriceTemp：{}", orderChildPriceTemp);
         }
 
 
+
         if (orderChildPriceTemp.compareTo(BigDecimal.ZERO) != 0) {
             //当前钱不够,需要记录,流程卡死,不往下走