From 976ff3fe092ee2f9515013dbfab77d25b2944b75 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 14 十月 2026 11:18:29 +0800
Subject: [PATCH] 修改bug
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
index f3f4ce3..863b390 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java
@@ -58,6 +58,16 @@
private String cardNo;
@ApiModelProperty(value = "VIN码快照")
private String vin;
+ @ApiModelProperty(value = "VIN管理记录ID（VIN码充电订单）")
+ private Long vinId;
+ @ApiModelProperty(value = "所属公司ID（VIN码充电订单建单快照）")
+ private Integer companyId;
+ @ApiModelProperty(value = "所属公司名称（按公司ID远程回填）")
+ private String companyName;
+ @ApiModelProperty(value = "所属车队ID（VIN码充电订单建单快照）")
+ private Integer fleetId;
+ @ApiModelProperty(value = "所属车队名称（按车队ID远程回填）")
+ private String fleetName;
@ApiModelProperty(value = "时段数")
private Integer count;
@ApiModelProperty(value = "充电结束原因")
@@ -72,4 +82,15 @@
private String electronicProportion;
@ApiModelProperty(value = "1明星充电 2快电 3新电途")
private Integer orderSource;
+ @ApiModelProperty(value = "账户模式（1=共享企业账户，2=分配卡账户；VIN/刷卡订单建单快照）")
+ private Integer accountMode;
+ @ApiModelProperty(value = "授权结束时间（企业政策授权截止时间，全天授权为空）")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime maxEndTime;
+ @ApiModelProperty(value = "锁定额度（申请时冻结金额，实扣冻结口径）")
+ private BigDecimal lockedAmount;
+ @ApiModelProperty(value = "优惠电费合计（原始电费-最终电费）")
+ private BigDecimal discountElectrovalence;
+ @ApiModelProperty(value = "优惠服务费合计（原始服务费-最终服务费）")
+ private BigDecimal discountServiceCharge;
}
--
Gitblit v1.7.1