From 95da1e36eaad95a0701c7b6f44534054d217557f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 二月 2025 18:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 10 ++++++++++
1 files changed, 10 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 cd6ebc7..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
@@ -17,6 +17,8 @@
@ApiModelProperty(value = "订单状态")
private Integer status;
+ @ApiModelProperty(value = "充值支付方式（1=微信，2=支付宝）")
+ private Integer rechargePaymentType;
@ApiModelProperty(value = "充值支付状态（1=待支付，2=已支付）")
private Integer rechargePaymentStatus;
@ApiModelProperty(value = "电站id")
@@ -27,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 = "订单编号")
@@ -59,6 +63,8 @@
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "平台手续费")
+ private BigDecimal rechargeAmount;
@ApiModelProperty(value = "引流平台")
private String sourceName;
@ApiModelProperty(value = "平台分佣")
@@ -86,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