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

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

@@ -109,20 +109,20 @@ public class OrderChildLoanComponent {
         if (subtract.compareTo(BigDecimal.ZERO) > 0) {
             //查询未结算的运单（没有产生扣除流水的运单）
             List<OrderChild> orderChildList = orderChildDao.selectInTransitOrderChildLtUnsettle(orderGoods.getOrderNo());
-            if (CollectionUtil.isEmpty(orderChildList)) {
-                log.info("当前未产生未结算的运单");
-                return;
-            }
             BigDecimal orderChildSum = null;
+            int size = 1;
+            if (CollectionUtil.isNotEmpty(orderChildList)) {
+                size = orderChildList.size();
+            }
             if (OrderGoodsOverWeightEnum.NO.getCode().equals(overWeight)) {
-                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(orderChildList.size()));
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(35)).multiply(new BigDecimal(size));
             } else {
-                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(orderChildList.size()));
+                orderChildSum = orderGoods.getPendingOrderFreight().multiply(new BigDecimal(50)).multiply(new BigDecimal(size));
             }
             BigDecimal ans = subtract.subtract(orderChildSum);
             log.info("6.当前订单冻结的预付运费还有剩余, 查询查询未结算的运单（没有产生扣除流水的运单）总计{},账户剩余{}", orderChildSum, subtract);
 
-            if (ans.compareTo(BigDecimal.ZERO) >= 0 && ans.compareTo(orderChildPrice) >= 0) {
+            if (ans.compareTo(BigDecimal.ZERO) >= 0) {
                 //预付运费够
                 log.info("7.预付运费足够,不限制");
                 return;
@@ -235,4 +235,11 @@ public class OrderChildLoanComponent {
             update.setVirtuallyAccountBalance(BigDecimal.ZERO);
         }
     }
+
+    public static void main(String[] args) {
+        BigDecimal bigDecimal = new BigDecimal(400000);
+        BigDecimal bigDecimal1 = new BigDecimal(280000);
+        BigDecimal ans = bigDecimal.subtract(bigDecimal1);
+        System.out.println(ans);
+    }
 }