接单限制

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

@@ -273,12 +273,19 @@ public class OrderChildServiceImpl implements OrderChildService {
         }
 
         // 库存验证
-        if (orderGoods.getResidueTransportWeight().compareTo(BigDecimal.ZERO) <= 0) {
+        if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("33")) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }
 //        if (orderGoods.getResidueTransportWeight().compareTo(truckLoad) < 0) {throw new ServiceSystemException
 //        (PerformanceResultEnum.ORDER_WEIGHT_LACK);}
 
+        // 订单数量限制
+        // 订单已拉运吨数
+        BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
+        if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
+            throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
+        }
+
         OrderChild orderChild = new OrderChild();
         orderChild.setChildNo(childNo);
         orderChild.setUserNo(userNo);
@@ -329,12 +336,7 @@ public class OrderChildServiceImpl implements OrderChildService {
             }
         }
 
-        // 订单数量限制
-        // 订单已拉运吨数
-        BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
-        if (alreadyTransportWeight.add(orderChild.getWeight()).compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
-            throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
-        }
+
 
 
         //orderChild.setWeight(orderChild.getTruckLoad());