From 0ca3a3922d2d25df52682b2290be15135cce100e Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期二, 29 九月 2026 17:56:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.3' into 2.3
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrder.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrder.java
index 99bf4a3..66b259d 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrder.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TCardChargingOrder.java
@@ -7,6 +7,9 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("t_card_charging_order")
@@ -28,4 +31,24 @@
@ApiModelProperty("所属车队ID（建单时充电卡快照，关联t_fleet.id）")
@TableField("fleet_id")
private Integer fleetId;
+
+ @ApiModelProperty("最大充电结束时间（授权截止时间，全天授权或未开启自动停充时为空）")
+ @TableField("max_end_time")
+ private LocalDateTime maxEndTime;
+
+ @ApiModelProperty("申请时锁定金额（共享=企业锁定额，分配=卡锁定额）")
+ @TableField("locked_amount")
+ private BigDecimal lockedAmount;
+
+ @ApiModelProperty("账户模式快照（1=共享，2=分配）")
+ @TableField("account_mode")
+ private Integer accountMode;
+
+ @ApiModelProperty("优惠电费合计（原始电费-最终电费）")
+ @TableField("discount_electrovalence")
+ private BigDecimal discountElectrovalence;
+
+ @ApiModelProperty("优惠服务费合计（原始服务费-最终服务费）")
+ @TableField("discount_service_charge")
+ private BigDecimal discountServiceCharge;
}
--
Gitblit v1.7.1