From 97da73a2186211a44f54c5cac7856db172ebda5e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 31 八月 2024 09:06:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 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 716f7a6..1c5ba30 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
@@ -1,6 +1,7 @@
package com.ruoyi.order.api.vo;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TOrderEvaluate;
import io.swagger.annotations.ApiModel;
@@ -8,21 +9,18 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
@Data
-@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
+@ApiModel(value = "ChargingOrderVO对象",description = "充电订单列表VO")
public class ChargingOrderVO extends TChargingOrder {
- @ApiModelProperty(value = "订单id")
- private Long id;
- @ApiModelProperty(value = "用户id")
- private Long userId;
@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 = "三方平台分佣")
@@ -31,8 +29,7 @@
private String licensePlate;
@ApiModelProperty(value = "手机号")
private String phone;
- @ApiModelProperty(value = "累计充电量")
- private BigDecimal chargingCapacity;
+
@ApiModelProperty(value = "累计电费")
private BigDecimal electrovalence;
@ApiModelProperty(value = "累计服务费")
--
Gitblit v1.7.1