计算运费和历史运费

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

@@ -313,9 +313,9 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
             rowData.add(new ExcelData(vo.getOrderDistance(), "-"));
             rowData.add(new ExcelData(vo.getSendAddressExpenses(), "-"));
             rowData.add(new ExcelData(Objects.nonNull(vo.getHistoryFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
-            rowData.add(new ExcelData(Objects.nonNull(vo.getHistoryAvgFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
-            rowData.add(new ExcelData(Objects.nonNull(vo.getPredictionFreightPrice())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
-            rowData.add(new ExcelData(Objects.nonNull(vo.getLogisticsFreight())?vo.getHistoryFreight().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getHistoryAvgFreight())?vo.getHistoryAvgFreight().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getPredictionFreightPrice())?vo.getPredictionFreightPrice().movePointLeft(2):null,"-"));
+            rowData.add(new ExcelData(Objects.nonNull(vo.getLogisticsFreight())?vo.getLogisticsFreight().movePointLeft(2):null,"-"));
             rowData.add(new ExcelData(""));
             dataList.add(rowData);
         }