From fe61200cfcaf257ad10496d0bc0b2ac8f1ecf45e Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 7 May 2024 11:22:45 +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 --- .../java/com/web/controller/business/OrderOilController.java | 2 +- .../src/main/java/com/hai/order/model/ExportGasOrderModel.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java index 8054172e..3829a671 100644 --- a/hai-order/src/main/java/com/web/controller/business/OrderOilController.java +++ b/hai-order/src/main/java/com/web/controller/business/OrderOilController.java @@ -338,7 +338,7 @@ public class OrderOilController { model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice()); model.setDeductionProductPrice(gasOrder.getDeductionProductPrice()); model.setPayablePrice(gasOrder.getPayablePrice()); - model.setPayGold(gasOrder.getPayGold()==null?null:gasOrder.getPayGold()/100); + model.setPayGold(gasOrder.getPayGold()==null?new BigDecimal("0"):new BigDecimal(""+gasOrder.getPayGold()).divide(new BigDecimal("100"))); model.setPayPrice(gasOrder.getPayPrice()!=null?gasOrder.getPayPrice().toString():"未支付"); model.setStatus(OrderOilStatus.getNameByType(gasOrder.getStatus())); model.setCreateTime(gasOrder.getCreateTime()); diff --git a/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java b/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java index 9cb977d4..dbcefcd7 100644 --- a/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java +++ b/hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java @@ -94,7 +94,7 @@ public class ExportGasOrderModel { @ColumnWidth(15) @ExcelProperty({ "支付信息", "积分抵扣"}) - private Integer payGold; + private BigDecimal payGold; @ColumnWidth(15) @ExcelProperty({ "支付信息", "实付金额"})