|
|
@ -164,6 +164,8 @@ public class HighGasController { |
|
|
|
BigDecimal price = new BigDecimal(MapUtils.getString(map, "price_gun")).subtract(new BigDecimal(MapUtils.getString(map, "preferential_margin"))); |
|
|
|
BigDecimal price = new BigDecimal(MapUtils.getString(map, "price_gun")).subtract(new BigDecimal(MapUtils.getString(map, "preferential_margin"))); |
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
map.put("price_vip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
map.put("price_vip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
map.put("price_vip", MapUtils.getString(map, "price_gun")); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -376,6 +378,8 @@ public class HighGasController { |
|
|
|
BigDecimal price = oilPrice.getPriceGun().subtract(oilPrice.getPreferentialMargin()); |
|
|
|
BigDecimal price = oilPrice.getPriceGun().subtract(oilPrice.getPreferentialMargin()); |
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
oilPriceMap.put("priceVip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
oilPriceMap.put("priceVip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
oilPriceMap.put("priceVip", oilPrice.getPriceGun()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -573,6 +577,8 @@ public class HighGasController { |
|
|
|
BigDecimal price = oilPrice.getPriceGun().subtract(oilPrice.getPreferentialMargin()); |
|
|
|
BigDecimal price = oilPrice.getPriceGun().subtract(oilPrice.getPreferentialMargin()); |
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
// (油枪价 - 优惠幅度) * 系统折扣
|
|
|
|
oilPriceMap.put("priceVip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
oilPriceMap.put("priceVip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
oilPriceMap.put("priceVip", oilPrice.getPriceGun()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|