From 8461d90c8ba36e2de2c14569b31ab148a673cb81 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 22 七月 2025 15:01:05 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 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..073682b 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,9 +14,10 @@
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")
@@ -27,8 +28,14 @@
private Long appUserId;
@ApiModelProperty(value = "用户车辆id")
private Long appUserCarId;
+ @ApiModelProperty(value = "车牌号")
+ private String plateNum;
+ @ApiModelProperty(value = "三方平台充电订单号")
+ private String startChargeSeq;
@ApiModelProperty(value = "充电枪id")
private Integer chargingGunId;
+ @ApiModelProperty(value = "订单来源（1=自己平台，2=三方平台）")
+ private Integer orderSource;
@ApiModelProperty(value = "订单编号")
private String code;
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@@ -41,10 +48,14 @@
private BigDecimal chargingCapacity;
@ApiModelProperty(value = "充电电流 度")
private BigDecimal electricity;
+ @ApiModelProperty(value = "充电支付金额")
+ private BigDecimal rechargeAmount;
@ApiModelProperty(value = "充电到账金额")
private BigDecimal orderAmount;
@ApiModelProperty(value = "会员抵扣金额")
private BigDecimal vipDiscountAmount;
+ @ApiModelProperty(value = "退款金额")
+ private BigDecimal refundAmount;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
@@ -60,7 +71,7 @@
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
@ApiModelProperty(value = "引流平台")
- private String sourceName;
+ private String tripartitePlatformName;
@ApiModelProperty(value = "平台分佣")
private BigDecimal sharingAmount;
@ApiModelProperty(value = "开始时间")
@@ -86,4 +97,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