From d8828959064d1339d1cb47fc6b6f997275c0f4ab Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期六, 31 八月 2024 17:40:31 +0800
Subject: [PATCH] 完善功能

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 58d079d..cd8aa59 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
@@ -109,6 +109,10 @@
     @ApiModelProperty(value = "充值支付第三方流水号")
     @TableField("recharge_serial_number")
     private String rechargeSerialNumber;
+    
+    @ApiModelProperty(value = "剩余金额(用于前端展示)")
+    @TableField("residual_amount")
+    private BigDecimal residualAmount;
 
     @ApiModelProperty(value = "订单金额(总金额)")
     @TableField("order_amount")
@@ -155,4 +159,17 @@
     @TableField("refund_time")
     private LocalDateTime refundTime;
 
+
+    @ApiModelProperty(value = "支付时间")
+    @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