From 00779ea0f8374e5bbdffc8faa20d65e3c72616c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 02 十一月 2024 19:26:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 49 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
index f09f67f..156e598 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java
@@ -31,7 +31,12 @@
@ApiModelProperty(value = "主键")
@TableId(value = "id", type = IdType.NONE)
private Long id;
-
+ @ApiModelProperty(value = "序号")
+ @TableField(exist = false)
+ private Integer xuhao;
+ @ApiModelProperty(value = "退款描述")
+ @TableField(exist = false)
+ private String refundContent;
@ApiModelProperty(value = "订单编号")
@TableField("code")
private String code;
@@ -68,6 +73,7 @@
@ApiModelProperty(value = "站点 id")
@TableField("site_id")
private Integer siteId;
+
@ApiModelProperty(value = "停车场id")
@TableField("parking_lot_id")
@@ -122,7 +128,11 @@
@ApiModelProperty(value = "充值支付第三方流水号")
@TableField("recharge_serial_number")
private String rechargeSerialNumber;
-
+
+ @ApiModelProperty(value = "充电金额（传给硬件方的金额）")
+ @TableField("charge_amount")
+ private BigDecimal chargeAmount;
+
@ApiModelProperty(value = "剩余金额（用于前端展示）")
@TableField("residual_amount")
private BigDecimal residualAmount;
@@ -154,8 +164,12 @@
@ApiModelProperty(value = "退款流水号")
@TableField("refund_code")
private String refundCode;
+
+ @ApiModelProperty(value = "标题")
+ @TableField("title")
+ private String title;
@ApiModelProperty(value = "退款原因")
- @TableField("refund_reason")
+ @TableField(exist = false)
private String refundReason;
@ApiModelProperty(value = "退款金额")
@@ -169,6 +183,18 @@
@ApiModelProperty(value = "累计电费")
@TableField("electrovalence")
private BigDecimal electrovalence;
+ @ApiModelProperty(value = "电流")
+ @TableField("current")
+ private BigDecimal current;
+ @ApiModelProperty(value = "电压")
+ @TableField("voltage")
+ private BigDecimal voltage;
+ @ApiModelProperty(value = "电量")
+ @TableField("electricity")
+ private BigDecimal electricity;
+ @ApiModelProperty(value = "功率")
+ @TableField("power")
+ private BigDecimal power;
@ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
@TableField("refund_status")
@@ -182,13 +208,20 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
-
+ @ApiModelProperty(value = "退款成功时间")
+ @TableField(exist = false)
+ private String refundTime1;
+ @ApiModelProperty(value = "总电量")
+ @TableField("total_electricity")
+ private BigDecimal totalElectricity;
@ApiModelProperty(value = "支付时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
+ @ApiModelProperty(value = "实时需求电流")
+ @TableField("need_elec")
+ private BigDecimal needElec;
@ApiModelProperty(value = "站点名称")
@TableField(exist = false)
private String siteName;
@@ -204,6 +237,9 @@
@ApiModelProperty(value = "支付方式")
@TableField(exist = false)
private String rechargePaymentType1;
+ @ApiModelProperty(value = "支付平台")
+ @TableField(exist = false)
+ private String payPlatform;
@ApiModelProperty(value = "充电启动方式")
@TableField(exist = false)
private String chargingType;
@@ -216,6 +252,9 @@
@ApiModelProperty(value = "充电费用")
@TableField(exist = false)
private String totalAmount;
+ @ApiModelProperty(value = "合计")
+ @TableField(exist = false)
+ private BigDecimal total;
@ApiModelProperty(value = "优惠抵扣")
@TableField(exist = false)
private String discount;
--
Gitblit v1.7.1