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

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -5051,8 +5051,8 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
                 orderQueryService.getOrderList(orderIds);
         Map<Long, OrderDO> orderMap = orderList.stream()
                 .collect(Collectors.toMap(OrderDO::getOrderId, v -> v));
-        Boolean freightMarkUp = vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0;
-        Boolean clearanceMarkUp = vo.getClearanceFee().compareTo(BigDecimal.ZERO) > 0;
+        Boolean freightMarkUp = Objects.nonNull(vo.getFreightFee()) && vo.getFreightFee().compareTo(BigDecimal.ZERO) > 0;
+        Boolean clearanceMarkUp = Objects.nonNull(vo.getClearanceFee()) && vo.getClearanceFee().compareTo(BigDecimal.ZERO) > 0;
         List<String> payOrderNoList = new ArrayList<>();
         List<ReceivableDO> newReceivableList = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(receivableList)) {