From d7d6f86630ee5aefcfa1486b753a94394809fc65 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 01 十一月 2024 20:28:53 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
index 2756fbb..39343ad 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,9 +37,20 @@
@TableField("app_user_id")
private Long appUserId;
+ @ApiModelProperty(value = "停车场名称")
+ @TableField("name")
+ private String name;
+
@ApiModelProperty(value = "车牌号")
@TableField("license_plate")
private String licensePlate;
+
+ @TableField(exist = false)
+ private String uid;
+
+ @ApiModelProperty(value = "订单编号")
+ @TableField("code")
+ private String code;
@ApiModelProperty(value = "车辆颜色")
@TableField("vehicle_color")
@@ -54,10 +66,12 @@
@ApiModelProperty(value = "入场时间")
@TableField("in_parking_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime inParkingTime;
@ApiModelProperty(value = "出场时间")
@TableField("out_parking_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime outParkingTime;
@ApiModelProperty(value = "停车时长（分钟）")
@@ -67,6 +81,14 @@
@ApiModelProperty(value = "总费用")
@TableField("order_amount")
private BigDecimal orderAmount;
+
+ @ApiModelProperty(value = "支付金额")
+ @TableField("payment")
+ private BigDecimal payment;
+
+ @ApiModelProperty(value = "支付方式")
+ @TableField("payType")
+ private String payType;
@ApiModelProperty(value = "状态（1=已进场，2=已出场，3=已缴费出场）")
@TableField("status")
@@ -78,7 +100,30 @@
@ApiModelProperty(value = "添加时间")
@TableField("create_time")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "超时占位费")
+ @TableField("timeout_amount")
+ private BigDecimal timeoutAmount;
+
+ @ApiModelProperty(value = "电话")
+ @TableField("phone")
+ private String phone;
+
+ @ApiModelProperty(value = "免费时长（分钟）")
+ @TableField("free_duration")
+ private Integer freeDuration;
+
+ @ApiModelProperty(value = "免费金额")
+ @TableField("free_amount")
+ private BigDecimal freeAmount;
+
+ @ApiModelProperty(value = "车场流水号")
+ @TableField("serialnumber")
+ private String serialnumber;
+ @TableField(exist = false)
+ private String parkName;
}
--
Gitblit v1.7.1