From a03469caafb8695da89e0f160be465dd49bb0fa3 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 04 九月 2024 14:33:30 +0800
Subject: [PATCH] 完善功能

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java |   12 ++++--------
 1 files changed, 4 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 9c48083..035fa15 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
@@ -123,6 +123,10 @@
     @TableField("recharge_serial_number")
     private String rechargeSerialNumber;
     
+    @ApiModelProperty(value = "充电金额(传给硬件方的金额)")
+    @TableField("charge_amount")
+    private BigDecimal chargeAmount;
+    
     @ApiModelProperty(value = "剩余金额(用于前端展示)")
     @TableField("residual_amount")
     private BigDecimal residualAmount;
@@ -158,14 +162,6 @@
     @ApiModelProperty(value = "退款金额")
     @TableField("refund_amount")
     private BigDecimal refundAmount;
-
-    @ApiModelProperty(value = "累计服务费")
-    @TableField("service_charge")
-    private BigDecimal serviceCharge;
-
-    @ApiModelProperty(value = "累计电费")
-    @TableField("electrovalence")
-    private BigDecimal electrovalence;
 
     @ApiModelProperty(value = "退款状态(1=退款中,2=退款成功)")
     @TableField("refund_status")

--
Gitblit v1.7.1