修改订单业务信息

performance-web/src/main/java/com/clx/performance/dao/impl/OrderChildDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.OrderChildDao;
@@ -186,9 +187,10 @@ public class OrderChildDaoImpl extends BaseDaoImpl<OrderChildMapper, OrderChild,
 
     @Override
     public List<OrderChild> getOrderChildBussInfo(String truckNo) {
-        return baseMapper.selectList(lambdaQuery().eq(OrderChild::getTruckNo, truckNo)
-                .eq(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE)
-        );
+        LambdaQueryWrapper<OrderChild> query = new LambdaQueryWrapper();
+        lambdaQuery().eq(OrderChild::getTruckNo, truckNo)
+                .eq(OrderChild::getStatus, OrderChildEnum.Status.COMPLETE);
+        return baseMapper.selectList(query);
     }
 
 }

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

@@ -1147,9 +1147,9 @@ public class OrderChildServiceImpl implements OrderChildService {
         //运单完成数量
         int complateNum = childList.size();
         //历史装车总量
-        BigDecimal historyLoadWeight = childList.stream().map(OrderChild::getLoadNet).reduce(BigDecimal::add).get();
+        BigDecimal historyLoadWeight = childList.stream().map(OrderChild::getLoadNet).filter(Objects::nonNull).reduce(BigDecimal::add).get();
         //完成拉运总量
-        BigDecimal complateCarryWeight = childList.stream().map(OrderChild::getUnloadNet).reduce(BigDecimal::add).get();
+        BigDecimal complateCarryWeight = childList.stream().map(OrderChild::getUnloadNet).filter(Objects::nonNull).reduce(BigDecimal::add).get();
         //亏吨数量总计
 
 
@@ -1161,8 +1161,8 @@ public class OrderChildServiceImpl implements OrderChildService {
             loseWeight = complateCarryWeight.subtract(historyLoadWeight);//亏吨
         }
         //亏吨率
-        BigDecimal loseRate = loseWeight.divide(historyLoadWeight).setScale(2,RoundingMode.HALF_UP);
-        BigDecimal overRate = overWeight.divide(historyLoadWeight).setScale(2,RoundingMode.HALF_UP);
+        BigDecimal loseRate = loseWeight.divide(historyLoadWeight,2,RoundingMode.HALF_UP);
+        BigDecimal overRate = overWeight.divide(historyLoadWeight,2,RoundingMode.HALF_UP);
         OrderChildBussInfoVO vo = OrderChildBussInfoVO.builder().completeNum(complateNum).historyLoadWeight(historyLoadWeight).completeCarryWeight(complateCarryWeight)
                 .loseWeight(loseWeight).loseRate(loseRate).overRate(overRate).build();
         return vo;