计算运费和历史运费

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

@@ -99,16 +99,6 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
                 pendingFreight.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
 
             }
-            //计算线路历史挂单运费
-            BigDecimal historyFreight = this.queryLinePendingFreight(data.getSendAddressId(),
-                    data.getReveiveAddressId());
-            //计算线路历史平均挂单运费
-            BigDecimal historyAvgFreight = this.queryLineAvgPendingFreight(data.getSendAddressId(),
-                    data.getReveiveAddressId());
-
-            pendingFreight.setHistoryFreight(historyFreight);
-            pendingFreight.setHistoryAvgFreight(historyAvgFreight);
-
             pendingFreightDao.updateEntityByKey(pendingFreight);
         }else{
             item.setOrderNo(data.getOrderNo());
@@ -121,6 +111,16 @@ public class PendingFreightServiceImpl  implements PendingFreightService {
                     sendAddress.getCity(),sendAddress.getCounty(),sendAddress.getAddress()));
             //计算重车运距
             item.setOrderDistance(calcOrderDistance(sendAddress,receiveAddress,data.getOrderNo()));
+
+            //计算线路历史挂单运费
+            BigDecimal historyFreight = this.queryLinePendingFreight(data.getSendAddressId(),
+                    data.getReveiveAddressId());
+            //计算线路历史平均挂单运费
+            BigDecimal historyAvgFreight = this.queryLineAvgPendingFreight(data.getSendAddressId(),
+                    data.getReveiveAddressId());
+
+            item.setHistoryFreight(historyFreight);
+            item.setHistoryAvgFreight(historyAvgFreight);
             pendingFreightDao.saveEntity(item);
         }
     }