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

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

@@ -154,6 +154,7 @@ public class OrderChildLoanComponent {
             BigDecimal loanResidueBalance = ownerLoanRecord.getLoanResidueBalance();
             log.info("12.当前预估运费金额：{},借款单号{},借款剩余金额{}", orderChildPriceTemp, ownerLoanRecord.getLoanNo(), loanResidueBalance);
             if (loanResidueBalance.compareTo(orderChildPriceTemp) >= 0) {
+                orderChildPriceTemp = BigDecimal.ZERO;
                 log.info("当前借款单的剩余金额足够预估运费金额");
                 generateFrozenOwnerLoanRunningWater(ownerLoanRecord, childNo, orderChildPrice);
                 updateList.add(ownerLoanRecord.setLoanResidueBalance(loanResidueBalance.subtract(orderChildPriceTemp)));
@@ -166,6 +167,10 @@ public class OrderChildLoanComponent {
             }
         }
 
+        if (orderChildPriceTemp.compareTo(BigDecimal.ZERO) != 0) {
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_SAVE_FAIL, "货主货款不足");
+        }
+
         for (OwnerLoanRecord update : updateList) {
             ownerLoanRecordDao.updateEntityByKey(update);
         }