From f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 05 九月 2024 17:50:33 +0800
Subject: [PATCH] 完善功能
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 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 2dacfee..0059cad 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,6 +122,14 @@
@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;
@ApiModelProperty(value = "订单金额(总金额)")
@TableField("order_amount")
@@ -181,12 +189,5 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("pay_time")
private LocalDateTime payTime;
-
- @ApiModelProperty(value = "累计服务费")
- @TableField("service_charge")
- private BigDecimal serviceCharge;
-
- @ApiModelProperty(value = "累计电费")
- @TableField("electrovalence")
- private BigDecimal electrovalence;
+
}
--
Gitblit v1.7.1