提交代码

2.0-dev
胡锐 7 months ago
parent acf29b6152
commit fe61200cfc
  1. 2
      hai-order/src/main/java/com/web/controller/business/OrderOilController.java
  2. 2
      hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.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());

@ -94,7 +94,7 @@ public class ExportGasOrderModel {
@ColumnWidth(15)
@ExcelProperty({ "支付信息", "积分抵扣"})
private Integer payGold;
private BigDecimal payGold;
@ColumnWidth(15)
@ExcelProperty({ "支付信息", "实付金额"})

Loading…
Cancel
Save