From 1d1e3c49ebd29144b2f6ce8710523bae763b855b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 14:38:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
index 8c46e37..32197f5 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java
@@ -21,7 +21,7 @@
private String end_time;// 结束时间
private BigDecimal total_electricity;// 总电量
private BigDecimal loss_total_electricity;// 计损总电量
- private BigDecimal pay_amount;// 消费金额
+ private BigDecimal payment_amount;// 消费金额
private Integer method;// 交易标识（1：app 启动，2：卡启动，4：离线卡启动，5: vin 码启动充电）
private String trade_date;// 交易日期、时间
private Integer stop_reason;// 停止原因
@@ -182,7 +182,7 @@
private BigDecimal valley_charge12;// 谷电量
private BigDecimal loss_valley_charge12;// 计损谷电量
private BigDecimal valley_amount12;// 谷金额
-
+ private String result;//原始字符串
}
--
Gitblit v1.7.1