From a146097a15d719c60af3cdeb4de1f21aa7b5ca8d Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 20 九月 2024 10:47:53 +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/model/TChargingOrder.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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..382ce1d 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
@@ -122,7 +122,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;
@@ -155,7 +159,7 @@
@TableField("refund_code")
private String refundCode;
@ApiModelProperty(value = "退款原因")
- @TableField("refund_reason")
+ @TableField(exist = false)
private String refundReason;
@ApiModelProperty(value = "退款金额")
@@ -182,13 +186,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("refund_time")
private LocalDateTime refundTime;
-
+ @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;
--
Gitblit v1.7.1