Merge remote-tracking branch 'origin/test' into test

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

@@ -286,7 +286,7 @@ public class OrderChildServiceImpl implements OrderChildService {
                 throw new ServiceSystemException(PerformanceResultEnum.ORDER_CHILD_DIRECT_ORDER_TRUCK_ERROR1);
             }
         }
-
+        log.info("-1--》"+orderGoods.getResidueTransportWeight());
         // 库存验证
         if (orderGoods.getResidueTransportWeight().compareTo(new BigDecimal("35")) < 0) {
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
@@ -297,6 +297,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         // 订单数量限制
         // 订单已拉运吨数
         BigDecimal alreadyTransportWeight = orderGoodsDao.sumAlreadyTransportWeightByOrderNo(orderGoods.getOrderNo());
+        log.info("-2--》"+alreadyTransportWeight);
+        log.info("-3--》"+orderInfo.getTransportWeight());
+        log.info("-4--》"+orderInfo.getDownFloatWeight());
         if (alreadyTransportWeight.compareTo(orderInfo.getTransportWeight().subtract(orderInfo.getDownFloatWeight())) > 0){
             throw new ServiceSystemException(PerformanceResultEnum.ORDER_WEIGHT_LACK);
         }