From de09da99330cf51bdab4934dae143a6cc72014d6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 26 十月 2024 11:26:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java |  185 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 160 insertions(+), 25 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 7359108..ca08587 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
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 import lombok.experimental.Accessors;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 import java.math.BigDecimal;
@@ -13,41 +14,175 @@
 @Data
 @Document(collection = "transaction_record") //指定要对应的文档名(表名)
 @Accessors(chain = true)
-public class TransactionRecord {
-
+public class TransactionRecord extends BaseModel {
     private String transaction_serial_number;// 交易流水号
     private String charging_pile_code;// 桩编码
     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;// 总电量
     private BigDecimal loss_total_electricity;// 计损总电量
-    private BigDecimal payment_amount;// 消费金额
-    private String vin;// 电动汽车唯一标识
-    private Integer start_method;// 交易标识(1:app 启动,2:卡启动,4:离线卡启动,5: vin 码启动充电)
+    private BigDecimal pay_amount;// 消费金额
+    private Integer method;// 交易标识(1:app 启动,2:卡启动,4:离线卡启动,5: vin 码启动充电)
     private String trade_date;// 交易日期、时间
     private Integer stop_reason;// 停止原因
     private String physical_card_number;// 物理卡号
-
-
+    private String billing_model_code1;// 计费模型编号
+    private BigDecimal spike_charge1;// 尖电量
+    private BigDecimal loss_spike_charge1;// 计损尖电量
+    private BigDecimal spike_amount1;// 尖金额
+    private BigDecimal flat_charge1;// 平电量
+    private BigDecimal loss_flat_charge1;// 计损平电量
+    private BigDecimal flat_amount1;// 平金额
+    private BigDecimal peak_charge1;// 峰电量
+    private BigDecimal loss_peak_charge1;// 计损峰电量
+    private BigDecimal peak_amount1;// 峰金额
+    private BigDecimal valley_charge1;// 谷电量
+    private BigDecimal loss_valley_charge1;// 计损谷电量
+    private BigDecimal valley_amount1;// 谷金额
+    private String billing_model_code2;// 计费模型编号
+    private BigDecimal spike_charge2;// 尖电量
+    private BigDecimal loss_spike_charge2;// 计损尖电量
+    private BigDecimal spike_amount2;// 尖金额
+    private BigDecimal flat_charge2;// 平电量
+    private BigDecimal loss_flat_charge2;// 计损平电量
+    private BigDecimal flat_amount2;// 平金额
+    private BigDecimal peak_charge2;// 峰电量
+    private BigDecimal loss_peak_charge2;// 计损峰电量
+    private BigDecimal peak_amount2;// 峰金额
+    private BigDecimal valley_charge2;// 谷电量
+    private BigDecimal loss_valley_charge2;// 计损谷电量
+    private BigDecimal valley_amount2;// 谷金额
+    private String billing_model_code3;// 计费模型编号
+    private BigDecimal spike_charge3;// 尖电量
+    private BigDecimal loss_spike_charge3;// 计损尖电量
+    private BigDecimal spike_amount3;// 尖金额
+    private BigDecimal flat_charge3;// 平电量
+    private BigDecimal loss_flat_charge3;// 计损平电量
+    private BigDecimal flat_amount3;// 平金额
+    private BigDecimal peak_charge3;// 峰电量
+    private BigDecimal loss_peak_charge3;// 计损峰电量
+    private BigDecimal peak_amount3;// 峰金额
+    private BigDecimal valley_charge3;// 谷电量
+    private BigDecimal loss_valley_charge3;// 计损谷电量
+    private BigDecimal valley_amount3;// 谷金额
+    private String billing_model_code4;// 计费模型编号
+    private BigDecimal spike_charge4;// 尖电量
+    private BigDecimal loss_spike_charge4;// 计损尖电量
+    private BigDecimal spike_amount4;// 尖金额
+    private BigDecimal flat_charge4;// 平电量
+    private BigDecimal loss_flat_charge4;// 计损平电量
+    private BigDecimal flat_amount4;// 平金额
+    private BigDecimal peak_charge4;// 峰电量
+    private BigDecimal loss_peak_charge4;// 计损峰电量
+    private BigDecimal peak_amount4;// 峰金额
+    private BigDecimal valley_charge4;// 谷电量
+    private BigDecimal loss_valley_charge4;// 计损谷电量
+    private BigDecimal valley_amount4;// 谷金额
+    private String billing_model_code5;// 计费模型编号
+    private BigDecimal spike_charge5;// 尖电量
+    private BigDecimal loss_spike_charge5;// 计损尖电量
+    private BigDecimal spike_amount5;// 尖金额
+    private BigDecimal flat_charge5;// 平电量
+    private BigDecimal loss_flat_charge5;// 计损平电量
+    private BigDecimal flat_amount5;// 平金额
+    private BigDecimal peak_charge5;// 峰电量
+    private BigDecimal loss_peak_charge5;// 计损峰电量
+    private BigDecimal peak_amount5;// 峰金额
+    private BigDecimal valley_charge5;// 谷电量
+    private BigDecimal loss_valley_charge5;// 计损谷电量
+    private BigDecimal valley_amount5;// 谷金额
+    private String billing_model_code6;// 计费模型编号
+    private BigDecimal spike_charge6;// 尖电量
+    private BigDecimal loss_spike_charge6;// 计损尖电量
+    private BigDecimal spike_amount6;// 尖金额
+    private BigDecimal flat_charge6;// 平电量
+    private BigDecimal loss_flat_charge6;// 计损平电量
+    private BigDecimal flat_amount6;// 平金额
+    private BigDecimal peak_charge6;// 峰电量
+    private BigDecimal loss_peak_charge6;// 计损峰电量
+    private BigDecimal peak_amount6;// 峰金额
+    private BigDecimal valley_charge6;// 谷电量
+    private BigDecimal loss_valley_charge6;// 计损谷电量
+    private BigDecimal valley_amount6;// 谷金额
+    private String billing_model_code7;// 计费模型编号
+    private BigDecimal spike_charge7;// 尖电量
+    private BigDecimal loss_spike_charge7;// 计损尖电量
+    private BigDecimal spike_amount7;// 尖金额
+    private BigDecimal flat_charge7;// 平电量
+    private BigDecimal loss_flat_charge7;// 计损平电量
+    private BigDecimal flat_amount7;// 平金额
+    private BigDecimal peak_charge7;// 峰电量
+    private BigDecimal loss_peak_charge7;// 计损峰电量
+    private BigDecimal peak_amount7;// 峰金额
+    private BigDecimal valley_charge7;// 谷电量
+    private BigDecimal loss_valley_charge7;// 计损谷电量
+    private BigDecimal valley_amount7;// 谷金额
+    private String billing_model_code8;// 计费模型编号
+    private BigDecimal spike_charge8;// 尖电量
+    private BigDecimal loss_spike_charge8;// 计损尖电量
+    private BigDecimal spike_amount8;// 尖金额
+    private BigDecimal flat_charge8;// 平电量
+    private BigDecimal loss_flat_charge8;// 计损平电量
+    private BigDecimal flat_amount8;// 平金额
+    private BigDecimal peak_charge8;// 峰电量
+    private BigDecimal loss_peak_charge8;// 计损峰电量
+    private BigDecimal peak_amount8;// 峰金额
+    private BigDecimal valley_charge8;// 谷电量
+    private BigDecimal loss_valley_charge8;// 计损谷电量
+    private BigDecimal valley_amount8;// 谷金额
+    private String billing_model_code9;// 计费模型编号
+    private BigDecimal spike_charge9;// 尖电量
+    private BigDecimal loss_spike_charge9;// 计损尖电量
+    private BigDecimal spike_amount9;// 尖金额
+    private BigDecimal flat_charge9;// 平电量
+    private BigDecimal loss_flat_charge9;// 计损平电量
+    private BigDecimal flat_amount9;// 平金额
+    private BigDecimal peak_charge9;// 峰电量
+    private BigDecimal loss_peak_charge9;// 计损峰电量
+    private BigDecimal peak_amount9;// 峰金额
+    private BigDecimal valley_charge9;// 谷电量
+    private BigDecimal loss_valley_charge9;// 计损谷电量
+    private BigDecimal valley_amount9;// 谷金额
+    private String billing_model_code10;// 计费模型编号
+    private BigDecimal spike_charge10;// 尖电量
+    private BigDecimal loss_spike_charge10;// 计损尖电量
+    private BigDecimal spike_amount10;// 尖金额
+    private BigDecimal flat_charge10;// 平电量
+    private BigDecimal loss_flat_charge10;// 计损平电量
+    private BigDecimal flat_amount10;// 平金额
+    private BigDecimal peak_charge10;// 峰电量
+    private BigDecimal loss_peak_charge10;// 计损峰电量
+    private BigDecimal peak_amount10;// 峰金额
+    private BigDecimal valley_charge10;// 谷电量
+    private BigDecimal loss_valley_charge10;// 计损谷电量
+    private BigDecimal valley_amount10;// 谷金额
+    private String billing_model_code11;// 计费模型编号
+    private BigDecimal spike_charge11;// 尖电量
+    private BigDecimal loss_spike_charge11;// 计损尖电量
+    private BigDecimal spike_amount11;// 尖金额
+    private BigDecimal flat_charge11;// 平电量
+    private BigDecimal loss_flat_charge11;// 计损平电量
+    private BigDecimal flat_amount11;// 平金额
+    private BigDecimal peak_charge11;// 峰电量
+    private BigDecimal loss_peak_charge11;// 计损峰电量
+    private BigDecimal peak_amount11;// 峰金额
+    private BigDecimal valley_charge11;// 谷电量
+    private BigDecimal loss_valley_charge11;// 计损谷电量
+    private BigDecimal valley_amount11;// 谷金额
+    private String billing_model_code12;// 计费模型编号
+    private BigDecimal spike_charge12;// 尖电量
+    private BigDecimal loss_spike_charge12;// 计损尖电量
+    private BigDecimal spike_amount12;// 尖金额
+    private BigDecimal flat_charge12;// 平电量
+    private BigDecimal loss_flat_charge12;// 计损平电量
+    private BigDecimal flat_amount12;// 平金额
+    private BigDecimal peak_charge12;// 峰电量
+    private BigDecimal loss_peak_charge12;// 计损峰电量
+    private BigDecimal peak_amount12;// 峰金额
+    private BigDecimal valley_charge12;// 谷电量
+    private BigDecimal loss_valley_charge12;// 计损谷电量
+    private BigDecimal valley_amount12;// 谷金额
 }
 
 

--
Gitblit v1.7.1