diff --git a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java index e140de0..09be0c7 100644 --- a/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java +++ b/bweb/src/main/java/com/bweb/controller/BsGasOrderController.java @@ -292,7 +292,7 @@ public class BsGasOrderController { model.setGasDiscount(gasOrder.getGasDiscount().compareTo(new BigDecimal("1")) != 0?gasOrder.getGasDiscount().multiply(new BigDecimal("100")).setScale(2).toString():"无"); model.setGasOilNo(gasOrder.getGasOilNo() + "#"); model.setGasGunNo(gasOrder.getGasGunNo() + "号枪"); - model.setGasPriceVip(gasOrder.getGasPriceVip()); + model.setGasPricePlatform(gasOrder.getGasPricePlatform()); model.setGasPriceGun(gasOrder.getGasPriceGun()); model.setGasPriceOfficial(gasOrder.getGasPriceOfficial()); model.setPayTypeName(gasOrder.getPayType()!=null? OrderPayTypeEnum.getDataByType(gasOrder.getPayType()).getName():"未支付"); @@ -326,7 +326,7 @@ public class BsGasOrderController { includeColumnFiledNames.add("gasOilNo"); includeColumnFiledNames.add("gasGunNo"); includeColumnFiledNames.add("gasDiscount"); - includeColumnFiledNames.add("gasPriceVip"); + includeColumnFiledNames.add("gasPricePlatform"); includeColumnFiledNames.add("gasPriceGun"); includeColumnFiledNames.add("gasPriceOfficial"); includeColumnFiledNames.add("payTypeName"); diff --git a/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java b/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java index 8ef30a2..d0a042f 100644 --- a/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java +++ b/service/src/main/java/com/hfkj/model/order/ExportGasOrderModel.java @@ -70,7 +70,7 @@ public class ExportGasOrderModel { @ColumnWidth(10) @ExcelProperty({ "加油信息", "平台价"}) - private BigDecimal gasPriceVip; + private BigDecimal gasPricePlatform; @ColumnWidth(10) @ExcelProperty({ "加油信息", "油站价"}) diff --git a/service/src/main/java/com/hfkj/service/gas/impl/BsGasServiceImpl.java b/service/src/main/java/com/hfkj/service/gas/impl/BsGasServiceImpl.java index af41f12..57578e8 100644 --- a/service/src/main/java/com/hfkj/service/gas/impl/BsGasServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/gas/impl/BsGasServiceImpl.java @@ -100,8 +100,8 @@ public class BsGasServiceImpl implements BsGasService { GasPayPriceModel payPriceModel = new GasPayPriceModel(); - // 嗨森逛平台价 油枪价 * 折扣 - BigDecimal pricePlatform = priceGun.multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP); + // 嗨森逛平台价 油站优惠价 * 折扣 + BigDecimal pricePlatform = priceVip.multiply(discount).setScale(2, BigDecimal.ROUND_HALF_UP); // 加油金额 payPriceModel.setOilingPrice(refuelPrice);