From 74b0e0814e37d640596f44ec86d20fa9ecce9ed6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 05 二月 2025 10:42:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
index 286972a..68c1847 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java
@@ -14,6 +14,13 @@
public class ChargingOrderListVO {
@ApiModelProperty(value = "电站名称")
private String siteName;
+
+ @ApiModelProperty(value = "订单状态")
+ private Integer status;
+ @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
+ private Integer rechargePaymentType;
+ @ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
+ private Integer rechargePaymentStatus;
@ApiModelProperty(value = "电站id")
private Integer siteId;
@ApiModelProperty(value = "充电桩id")
@@ -34,12 +41,20 @@
private Long chargingSecond;
@ApiModelProperty(value = "充电电流 度")
private BigDecimal chargingCapacity;
+ @ApiModelProperty(value = "充电电流 度")
+ private BigDecimal electricity;
+ @ApiModelProperty(value = "充电到账金额")
+ private BigDecimal orderAmount;
+ @ApiModelProperty(value = "会员抵扣金额")
+ private BigDecimal vipDiscountAmount;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
private String phone;
@ApiModelProperty(value = "充电到账金额")
private BigDecimal paymentAmount;
+ @ApiModelProperty(value = "充电后剩余金额")
+ private BigDecimal residualAmount;
@ApiModelProperty(value = "累计电费")
private BigDecimal electrovalence;
@ApiModelProperty(value = "累计服务费")
@@ -53,6 +68,11 @@
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
+ @ApiModelProperty(value = "最后支付时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime payTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createTime;
@ApiModelProperty(value = "结束时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime endTime;
@@ -68,4 +88,8 @@
private Long id;
@ApiModelProperty(value = "订单uid")
private String uid;
+ @ApiModelProperty(value = "订单详情按钮权限 ")
+ private Boolean authInfo = true;
+ @ApiModelProperty(value = "充电曲线按钮权限 ")
+ private Boolean authCurve = true;
}
--
Gitblit v1.7.1