Merge branch 'master-fix' into release

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderBusinessServiceImpl.java

@@ -2563,7 +2563,7 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         //计较体积
 
         BigDecimal chargeVolume =
-                newOrderItemDOList.stream().map(OrderItemDO::getChargeVolume).
+                newOrderItemDOList.stream().map(OrderItemDO::getChargeVolume).filter(Objects::nonNull).
                         reduce(BigDecimal.ZERO, BigDecimal::add);
         BigDecimal sumVolume = newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).filter(Objects::nonNull).map(WarehouseInInfoVO::getVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
         orderDO.setSumVolume(sumVolume);
@@ -2571,12 +2571,12 @@ public class OrderBusinessServiceImpl extends AbstractService<OrderMapper, Order
         //计价总重量
 
         BigDecimal chargeWeight =
-                newOrderItemDOList.stream().map(OrderItemDO::getChargeWeight).
+                newOrderItemDOList.stream().map(OrderItemDO::getChargeWeight).filter(Objects::nonNull).
                         reduce(BigDecimal.ZERO, BigDecimal::add);
 
         BigDecimal sumWeight =
                 newOrderItemDOList.stream().map(OrderItemDO::getWarehouseInInfoVO).
-                        filter(Objects::nonNull).map(WarehouseInInfoVO::getWeight).
+                        filter(Objects::nonNull).map(WarehouseInInfoVO::getWeight).filter(Objects::nonNull).
                         reduce(BigDecimal.ZERO, BigDecimal::add);
 
         orderDO.setSumWeight(sumWeight);

yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/service/sms/SmsSendServiceImpl.java

@@ -390,6 +390,7 @@ public class SmsSendServiceImpl implements SmsSendService {
         if ((Objects.isNull(businessProperties) || !businessProperties.isDebug()) && smsChannel.getStatus() == 0) {
             smsProducer.sendSmsSendMessageV2(smsSendMessage);
         }
+
         return sendLogId;
     }