From fd90eaebe2d70d1f7cf7ee511f084e0b97fc16a2 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期四, 06 二月 2025 17:08:12 +0800 Subject: [PATCH] 修改bug和对接测试iotd --- ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TParkingRecord.java | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 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 b6cd84b..441ea7f 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 @@ -22,7 +22,6 @@ * @since 2024-08-08 */ @Data -@EqualsAndHashCode(callSuper = false) @TableName("t_parking_record") @ApiModel(value="TParkingRecord对象", description="") public class TParkingRecord implements Serializable { @@ -36,14 +35,19 @@ @ApiModelProperty(value = "用户id") @TableField("app_user_id") private Long appUserId; + + @ApiModelProperty(value = "订单标题") + @TableField("title") + private String title; + + @ApiModelProperty(value = "停车场名称") + @TableField("name") + private String name; @ApiModelProperty(value = "车牌号") @TableField("license_plate") private String licensePlate; - - @TableField(exist = false) - private String name; - + @TableField(exist = false) private String uid; @@ -80,6 +84,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") @@ -114,5 +126,15 @@ @TableField("serialnumber") private String serialnumber; + @TableField(exist = false) + private String parkName; + @ApiModelProperty(value = "查看按钮权限 ") + @TableField(exist = false) + + private Boolean authInfo = true; + @ApiModelProperty(value = "已出场按钮权限 ") + @TableField(exist = false) + + private Boolean authOut = true; } -- Gitblit v1.7.1