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

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtLogisticsConsignmentService.java

@@ -2666,15 +2666,15 @@ public class KwtLogisticsConsignmentService {
         // 按装货量计费
         if (org.apache.commons.lang3.StringUtils.equals(billingMode, DictEnum.CHARGING_TYPE_1.getValue())) {
             totalAmount = pendingUnloadSubtasks.stream()
-                    .filter(subtask -> Objects.nonNull(subtask.getLoadAmount()))
                     .map(KwtWaybillOrderSubtask::getLoadAmount)
+                    .filter(x -> Objects.nonNull(x))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
         // 按卸货量计费
         else if (org.apache.commons.lang3.StringUtils.equals(billingMode, DictEnum.CHARGING_TYPE_2.getValue())) {
             totalAmount = pendingUnloadSubtasks.stream()
-                    .filter(subtask -> Objects.nonNull(subtask.getUnloadAmount()))
                     .map(KwtWaybillOrderSubtask::getUnloadAmount)
+                    .filter(x -> Objects.nonNull(x))
                     .reduce(BigDecimal.ZERO, BigDecimal::add);
         }
     return totalAmount;