Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-AMS-API

src/main/java/com/steerinfo/dil/service/impl/AmsContractTransportPriceServiceImpl.java

@@ -126,9 +126,9 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
                 amsContractTransportPrice.setCarrierId(DataChange.dataToBigDecimal(split[i]));
                 //生成主键id
                 amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
-                if(lineId == null){
+                if(lineId.compareTo(BigDecimal.ZERO)==0){
                     //计算并插入吨公里
-                    BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometer(lineId, priceValue);
+                    BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometerNew(haulDistance, priceValue);
                     amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
                 }
                 amsContractTransportPrice.setType(new BigDecimal(1));
@@ -182,9 +182,9 @@ public class AmsContractTransportPriceServiceImpl implements IAmsContractTranspo
             amsContractTransportPrice.setCarrierId(DataChange.dataToBigDecimal(split[0]));
             //生成主键id
             amsContractTransportPrice.setPriceId(amsContractTruckPriceMapper.selectMaxId());
-            if(lineId == null){
+            if(lineId.compareTo(BigDecimal.ZERO)==0){
                 //计算并插入吨公里
-                BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometer(lineId, priceValue);
+                BigDecimal priceTonKilometer = amsContractTruckPriceService.calculationPriceTonKilometerNew(haulDistance, priceValue);
                 amsContractTransportPrice.setPriceTonKilometer(priceTonKilometer);
             }
             amsContractTransportPrice.setType(new BigDecimal(1));

src/main/java/com/steerinfo/dil/service/impl/AmsContractTruckPriceServiceImpl.java

@@ -125,6 +125,15 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         return priceTonKilometer;
     }
 
+    //计算吨公里值（销售钢材运价专用）
+    public BigDecimal calculationPriceTonKilometerNew(BigDecimal haulDistance,BigDecimal priceValue){
+        //查询参考运距
+        //BigDecimal linePathLength = amsContractTruckPriceMapper.getLinePathLength(lineId);
+        //计算吨公里	吨公里（元/吨.km） = 运价（元/吨）/ 参考运距（公里），保留4位小数
+        BigDecimal priceTonKilometer = priceValue.divide(haulDistance, 4, BigDecimal.ROUND_HALF_UP);
+        return priceTonKilometer;
+    }
+
     @Override
     public List<Map<String, Object>> getAmsContractTransportPrice(Map<String, Object> map) {
         return amsContractTruckPriceMapper.getAmsContractTransportPrice(map);