From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 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..2147175 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")
@@ -22,8 +29,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=充电订单（刷卡））")
@@ -34,25 +47,40 @@
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 = "累计服务费")
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
private BigDecimal commissionAmount;
+ @ApiModelProperty(value = "平台手续费")
+ private BigDecimal rechargeAmount;
@ApiModelProperty(value = "引流平台")
- private String sourceName;
+ private String tripartitePlatformName;
@ApiModelProperty(value = "平台分佣")
private BigDecimal sharingAmount;
@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 +96,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