逆向

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

@@ -224,10 +224,14 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
         } else {
             String residueWeight = orderInfoFeign.getResidueWeight();
             List<OrderChild> orderChildList = orderChildDao.selectResidueWeight(orderNo, OrderChildEnum.Status.ARRIVE_SEND.getCode());
-            BigDecimal childResidueWeight = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
-            BigDecimal orderGoodsResidueWeight = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo).stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal::add).get();
+            BigDecimal childResidueWeight = BigDecimal.ZERO;
+            if (CollectionUtils.isNotEmpty(orderChildList)) {
+                childResidueWeight = orderChildList.stream().map(OrderChild::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+
+            }
+            BigDecimal orderGoodsResidueWeight = orderGoodsDao.getOrderGoodsListByOrderNo(orderNo).stream().map(OrderGoods::getResidueTransportWeight).reduce(BigDecimal.ZERO,BigDecimal::add);
 
-            return childResidueWeight.add(new BigDecimal(residueWeight)).add(orderGoodsResidueWeight);
+            return new BigDecimal(residueWeight).add(orderGoodsResidueWeight).add(childResidueWeight);
         }
 
     }