From 0911582d2f80e7f3162fb6d0b59ee12e23de133b Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 17 十月 2024 09:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java | 64 ++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 16 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
index b25fd4a..82129ee 100644
--- a/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
+++ b/ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java
@@ -20,22 +20,6 @@
private String charging_gun_code;// 抢号
private String start_time;// 开始时间
private String end_time;// 结束时间
- private BigDecimal sharp_peak_unit_price;// 尖单价
- private BigDecimal sharp_peak_charge;// 尖电量
- private BigDecimal loss_sharp_peak_charge;// 计损尖电量
- private BigDecimal sharp_peak_amount;// 尖金额
- private BigDecimal peak_unit_price;// 峰单价
- private BigDecimal peak_charge;// 峰电量
- private BigDecimal loss_peak_charge;// 计损峰电量
- private BigDecimal peak_amount;// 峰金额
- private BigDecimal flat_peak_unit_price;// 平单价
- private BigDecimal flat_peak_charge;// 平电量
- private BigDecimal loss_flat_peak_charge;// 计损平电量
- private BigDecimal flat_peak_amount;// 平金额
- private BigDecimal low_peak_unit_price;// 谷单价
- private BigDecimal low_peak_charge;// 谷电量
- private BigDecimal loss_low_peak_charge;// 计损谷电量
- private BigDecimal low_peak_amount;// 谷金额
private BigDecimal total_initial_value;// 电表总起值
private BigDecimal total_stop_value;// 电表总止值
private BigDecimal total_electricity;// 总电量
@@ -46,6 +30,54 @@
private String trade_date;// 交易日期、时间
private Integer stop_reason;// 停止原因
private String physical_card_number;// 物理卡号
+ private String time1;// 计费时段
+ private BigDecimal sharp_peak_charge1;// 电量
+ private BigDecimal loss_sharp_peak_charge1;// 计损电量
+ private BigDecimal sharp_peak_amount1;// 金额
+ private String time2;// 计费时段
+ private BigDecimal sharp_peak_charge2;// 电量
+ private BigDecimal loss_sharp_peak_charge2;// 计损电量
+ private BigDecimal sharp_peak_amount2;// 金额
+ private String time3;// 计费时段
+ private BigDecimal sharp_peak_charge3;// 电量
+ private BigDecimal loss_sharp_peak_charge3;// 计损电量
+ private BigDecimal sharp_peak_amount3;// 金额
+ private String time4;// 计费时段
+ private BigDecimal sharp_peak_charge4;// 电量
+ private BigDecimal loss_sharp_peak_charge4;// 计损电量
+ private BigDecimal sharp_peak_amount4;// 金额
+ private String time5;// 计费时段
+ private BigDecimal sharp_peak_charge5;// 电量
+ private BigDecimal loss_sharp_peak_charge5;// 计损电量
+ private BigDecimal sharp_peak_amount5;// 金额
+ private String time6;// 计费时段
+ private BigDecimal sharp_peak_charge6;// 电量
+ private BigDecimal loss_sharp_peak_charge6;// 计损电量
+ private BigDecimal sharp_peak_amount6;// 金额
+ private String time7;// 计费时段
+ private BigDecimal sharp_peak_charge7;// 电量
+ private BigDecimal loss_sharp_peak_charge7;// 计损电量
+ private BigDecimal sharp_peak_amount7;// 金额
+ private String time8;// 计费时段
+ private BigDecimal sharp_peak_charge8;// 电量
+ private BigDecimal loss_sharp_peak_charge8;// 计损电量
+ private BigDecimal sharp_peak_amount8;// 金额
+ private String time9;// 计费时段
+ private BigDecimal sharp_peak_charge9;// 电量
+ private BigDecimal loss_sharp_peak_charge9;// 计损电量
+ private BigDecimal sharp_peak_amount9;// 金额
+ private String time10;// 计费时段
+ private BigDecimal sharp_peak_charge10;// 电量
+ private BigDecimal loss_sharp_peak_charge10;// 计损电量
+ private BigDecimal sharp_peak_amount10;// 金额
+ private String time11;// 计费时段
+ private BigDecimal sharp_peak_charge11;// 电量
+ private BigDecimal loss_sharp_peak_charge11;// 计损电量
+ private BigDecimal sharp_peak_amount11;// 金额
+ private String time12;// 计费时段
+ private BigDecimal sharp_peak_charge12;// 电量
+ private BigDecimal loss_sharp_peak_charge12;// 计损电量
+ private BigDecimal sharp_peak_amount12;// 金额
}
--
Gitblit v1.7.1