From 08c9f362cd04ad95d19ffa08fda681531d97bdba Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Mon, 6 Feb 2023 15:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cweb/controller/HighGasController.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java index 19339b15..86103a26 100644 --- a/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java +++ b/hai-cweb/src/main/java/com/cweb/controller/HighGasController.java @@ -164,6 +164,8 @@ public class HighGasController { 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)); + } else { + map.put("price_vip", MapUtils.getString(map, "price_gun")); } } @@ -376,6 +378,8 @@ public class HighGasController { BigDecimal price = oilPrice.getPriceGun().subtract(oilPrice.getPreferentialMargin()); // (油枪价 - 优惠幅度) * 系统折扣 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()); // (油枪价 - 优惠幅度) * 系统折扣 oilPriceMap.put("priceVip", price.multiply(priceRate).setScale(2, BigDecimal.ROUND_HALF_UP)); + } else { + oilPriceMap.put("priceVip", oilPrice.getPriceGun()); } }