From 34182c18b4bdd81ab7d59d4e8441cd9134477c15 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 13:40:21 +0800
Subject: [PATCH] 合併代碼
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderListVO.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 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 c227b8e..051ce98 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,18 @@
public class ChargingOrderListVO {
@ApiModelProperty(value = "电站名称")
private String siteName;
+ @ApiModelProperty(value = "订单状态")
+ private Integer status;
+ @ApiModelProperty(value = "电站id")
+ private Integer siteId;
+ @ApiModelProperty(value = "充电桩id")
+ private Integer chargingPileId;
+ @ApiModelProperty(value = "用户id")
+ private Long appUserId;
+ @ApiModelProperty(value = "用户车辆id")
+ private Long appUserCarId;
+ @ApiModelProperty(value = "充电枪id")
+ private Integer chargingGunId;
@ApiModelProperty(value = "订单编号")
private String code;
@ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
@@ -23,7 +35,7 @@
@ApiModelProperty(value = "充电时间 秒")
private Long chargingSecond;
@ApiModelProperty(value = "充电电流 度")
- private String chargingCapacity;
+ private BigDecimal chargingCapacity;
@ApiModelProperty(value = "车牌号")
private String licensePlate;
@ApiModelProperty(value = "客户手机号")
@@ -35,11 +47,11 @@
@ApiModelProperty(value = "累计服务费")
private BigDecimal serviceCharge;
@ApiModelProperty(value = "平台手续费")
- private BigDecimal platFormMoney;
+ private BigDecimal commissionAmount;
@ApiModelProperty(value = "引流平台")
- private String platform;
+ private String sourceName;
@ApiModelProperty(value = "平台分佣")
- private BigDecimal platformCommission;
+ private BigDecimal sharingAmount;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime startTime;
@@ -54,4 +66,8 @@
private Integer endMode;
@ApiModelProperty(value = "电流占比")
private String electronicProportion;
+ @ApiModelProperty(value = "订单id")
+ private Long id;
+ @ApiModelProperty(value = "订单uid")
+ private String uid;
}
--
Gitblit v1.7.1