提交代码

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

@@ -380,10 +380,10 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
                             continue;
                         }else{
                             //小于10km取中标价格
-                            Map<String,Object> updatePrice=new HashMap<>();
+                            /*Map<String,Object> updatePrice=new HashMap<>();
                             updatePrice.put("priceId",DataChange.dataToBigDecimal(stringObjectMap.get("priceId")));
                             updatePrice.put("priceValue",DataChange.dataToBigDecimal(zb.get("priceValue")));
-                            return amsContractTruckPriceMapper.updateByPriceId(updatePrice);
+                            return amsContractTruckPriceMapper.updateByPriceId(updatePrice);*/
                         }
                     }
                 }
@@ -518,7 +518,7 @@ public class AmsContractTruckPriceServiceImpl implements IAmsContractTruckPriceS
         try {
             nowPriceValue = UpdatePureBenzenePriceValueByOilPrice(n.toString(),amsContractTransportPrice.getPriceValue(),formulaId);
             //保留两位小数
-            nowPriceValue = nowPriceValue.divide(new BigDecimal(1),3,0);
+            nowPriceValue = nowPriceValue.divide(new BigDecimal(1),2,BigDecimal.ROUND_HALF_UP);
             //调整纯苯运价
             amsContractTransportPrice.setPriceValue(nowPriceValue);
             //修改基准油价

src/main/resources/com/steerinfo/dil/mapper/AmsContractTruckPriceMapper.xml

@@ -1336,6 +1336,7 @@
            a_t_price.place_id "placeId"
     from AMS_CONTRACT_TRANSPORT_PRICE a_t_price
     where a_t_price.OIL_TYPE_ID = #{oilTypeId} and a_t_price.DELETED = 0
+    and a_t_price.type=1
     order by reference_ht desc
   </select>
 
@@ -1533,7 +1534,8 @@
         price_value "priceValue"
         from  AMS_CONTRACT_TRANSPORT_PRICE
        where place_id in (select place_id from RMS_RECEIVE_PLACE t where address_id =
-       (select address_id from RMS_RECEIVE_PLACE t where place_id=#{placeId} )) and reference_ht is not null
+       (select address_id from RMS_RECEIVE_PLACE t where place_id=#{placeId} ))
+       --and reference_ht is not null
        AND DELETED = 0
        ORDER BY PRICE_DATE DESC
        FETCH FIRST 1 ROW ONLY