diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java index f0798b234..e30260a97 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/OrderListVO.java @@ -158,6 +158,12 @@ public class OrderListVO { @Excel(name = "充电时长") private String chargingTime; + /** + * 充电度数 + */ + @Excel(name = "充电度数") + private String chargingDegree; + /** * 支付金额 */ @@ -170,6 +176,18 @@ public class OrderListVO { @Excel(name = "订单金额") private String orderAmount; + /** + * 电费金额 + */ + @Excel(name = "电费") + private BigDecimal totalElectricityAmount; + + /** + * 服务费金额 + */ + @Excel(name = "服务费") + private BigDecimal totalServiceAmount; + /** * 虚拟金额 */ @@ -200,12 +218,6 @@ public class OrderListVO { @Excel(name = "创建日期") private String createTime; - /** - * 充电度数 - */ - @Excel(name = "充电度数") - private String chargingDegree; - /** * 微信商户单号 */ @@ -217,18 +229,6 @@ public class OrderListVO { */ private String paymentInstitutions; - /** - * 电费金额 - */ - @Excel(name = "电费") - private BigDecimal totalElectricityAmount; - - /** - * 服务费金额 - */ - @Excel(name = "服务费") - private BigDecimal totalServiceAmount; - /** * 实时消费金额 */