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 | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 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 ab1db5f..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
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TOrderEvaluate;
import io.swagger.annotations.ApiModel;
@@ -13,31 +15,82 @@
import java.util.List;
@Data
-@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
+@ApiModel(value = "ChargingOrderVO对象",description = "充电订单列表VO")
public class ChargingOrderVO extends TChargingOrder {
+ @JsonSerialize(using = ToStringSerializer.class)
+ @Override
+ public Long getId() {
+ return super.getId();
+ }
+
@ApiModelProperty(value = "站点名称")
private String siteName;
@ApiModelProperty(value = "充电终端名称 桩+枪")
private String terminalName;
@ApiModelProperty(value = "充电时间 秒")
- private Integer chargingSecond;
+ private Long chargingSecond;
@ApiModelProperty(value = "平台手续费")
private BigDecimal platFormMoney;
- @ApiModelProperty(value = "三方平台分佣")
- private BigDecimal commission;
+ @ApiModelProperty(value = "余额收入")
+ private BigDecimal balanceIncome;
+ @ApiModelProperty(value = "赠送费用")
+ private BigDecimal balanceGiftIncome;
+ @ApiModelProperty(value = "平台收入")
+ private BigDecimal platformIncome;
+ @ApiModelProperty(value = "合作商收入")
+ private BigDecimal partnerIncome;
+ @ApiModelProperty(value = "白名单用户退款金额")
+ private BigDecimal whitelistRefundAmount;
+
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "手机号")
private String phone;
- @ApiModelProperty(value = "累计充电量")
- private BigDecimal chargingCapacity;
- @ApiModelProperty(value = "累计电费")
- private BigDecimal electrovalence;
- @ApiModelProperty(value = "累计服务费")
- private BigDecimal serviceCharge;
+ @ApiModelProperty(value = "归属合作商/服务商")
+ private String partnerName;
+ @ApiModelProperty(value = "uid")
+ private String uid;
+ @ApiModelProperty(value = "记录按钮权限 ")
+ private Boolean authRecord = true;
+
+
+ @ApiModelProperty(value = "刷卡开卡号")
+ 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 = "充电结束原因")
+ private Integer endMode;
+ @ApiModelProperty(value = "充电电流")
+ private BigDecimal chargeCurrent;
+ @ApiModelProperty(value = "充电电压")
+ private BigDecimal chargeVoltage;
+ @ApiModelProperty(value = "实时功率")
+ private BigDecimal chargePower;
+ @ApiModelProperty(value = "电流占比")
+ 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