From 0d4c9f50ee2bc3e4a03abd91ac7c9e03891d37f2 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 20 二月 2025 17:41:19 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 20 ++++++++++++++++++++
1 files changed, 20 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 57bc9ba..e30cd56 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,8 +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")
@@ -24,6 +29,8 @@
private Long appUserId;
@ApiModelProperty(value = "用户车辆id")
private Long appUserCarId;
+ @ApiModelProperty(value = "车牌号")
+ private String plateNum;
@ApiModelProperty(value = "充电枪id")
private Integer chargingGunId;
@ApiModelProperty(value = "订单编号")
@@ -40,6 +47,8 @@
private BigDecimal electricity;
@ApiModelProperty(value = "充电到账金额")
private BigDecimal orderAmount;
+ @ApiModelProperty(value = "会员抵扣金额")
+ private BigDecimal vipDiscountAmount;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
@@ -54,6 +63,8 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "平台手续费")
+ private BigDecimal rechargeAmount;
@ApiModelProperty(value = "引流平台")
private String sourceName;
@ApiModelProperty(value = "平台分佣")
@@ -61,6 +72,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;
@@ -76,4 +92,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