计算运费和历史运费

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

@@ -159,7 +159,11 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
     //查询该线路最新的历史运费
     public BigDecimal queryLinePendingFreight(Integer sendAddressId,Integer receiveAddressId){
         OrderGoods orderGoods = orderGoodsDao.queryLineNewestPendingFreight(sendAddressId,receiveAddressId);
-        return orderGoods.getPendingOrderFreight();
+        if(Objects.nonNull(orderGoods)){
+            return orderGoods.getPendingOrderFreight();
+        }
+        return BigDecimal.ZERO;
+
     }
 
 
@@ -170,7 +174,7 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
 
         List<OrderGoods> list = orderGoodsDao.queryLineAvgPendingFreight(sendAddressId,receiveAddressId,monthAgo,now);
         if(CollectionUtils.isEmpty(list)){
-            return null;
+            return BigDecimal.ZERO;
         }
         BigDecimal total = BigDecimal.ZERO;
         for (OrderGoods orderGoods : list) {