From e815e6571db2c81bf05be7d507cca50ab02a619d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 18 十月 2024 15:13:50 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java            |   20 
 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java                   |    2 
 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/rocket/model/TransactionRecordMessage.java |  313 +++++++++---------
 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/model/TransactionRecord.java           |  313 +++++++++---------
 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java     |    2 
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java                 |  313 +++++++++---------
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java                               |    2 
 7 files changed, 477 insertions(+), 488 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
index dfaa896..3351f9c 100644
--- a/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
+++ b/ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java
@@ -55,7 +55,7 @@
 
     @ApiModelProperty(value = "报修时间")
     @TableField("repair_time")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm:ss")
     private LocalDateTime repairTime;
 
 
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 11c40de..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
@@ -20,172 +20,169 @@
     private String charging_gun_code;// 抢号
     private String start_time;// 开始时间
     private String end_time;// 结束时间
-    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 time1;// 计费时段
-    private BigDecimal sharp_peak_charge1;// 尖电量
-    private BigDecimal loss_sharp_peak_charge1;// 计损尖电量
-    private BigDecimal sharp_peak_amount1;// 尖金额
-    private BigDecimal flat_peak_charge1;// 平电量
-    private BigDecimal loss_flat_peak_char1;// 计损平电量
-    private BigDecimal flat_peak_amount1;// 平金额
+    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 low_peak_charge1;// 谷电量
-    private BigDecimal loss_low_peak_charge1;// 计损谷电量
-    private BigDecimal low_peak_amount1;// 谷金额
-    private String time2;// 计费时段
-    private BigDecimal sharp_peak_charge2;// 电量
-    private BigDecimal loss_sharp_peak_charge2;// 计损电量
-    private BigDecimal sharp_peak_amount2;// 金额
-    private BigDecimal flat_peak_charge2;// 电量
-    private BigDecimal loss_flat_peak_char2;// 计损电量
-    private BigDecimal flat_peak_amount2;// 金额
-    private BigDecimal peak_charge2;// 电量
-    private BigDecimal loss_peak_charge2;// 计损电量
-    private BigDecimal peak_amount2;// 金额
-    private BigDecimal low_peak_charge2;// 电量
-    private BigDecimal loss_low_peak_charge2;// 计损电量
-    private BigDecimal low_peak_amount2;// 金额
-    private String time3;// 计费时段
-    private BigDecimal sharp_peak_charge3;// 电量
-    private BigDecimal loss_sharp_peak_charge3;// 计损电量
-    private BigDecimal sharp_peak_amount3;// 金额
-    private BigDecimal flat_peak_charge3;// 电量
-    private BigDecimal loss_flat_peak_char3;// 计损电量
-    private BigDecimal flat_peak_amount3;// 金额
-    private BigDecimal peak_charge3;// 电量
-    private BigDecimal loss_peak_charge3;// 计损电量
-    private BigDecimal peak_amount3;// 金额
-    private BigDecimal low_peak_charge3;// 电量
-    private BigDecimal loss_low_peak_charge3;// 计损电量
-    private BigDecimal low_peak_amount3;// 金额
-    private String time4;// 计费时段
-    private BigDecimal sharp_peak_charge4;// 电量
-    private BigDecimal loss_sharp_peak_charge4;// 计损电量
-    private BigDecimal sharp_peak_amount4;// 金额
-    private BigDecimal flat_peak_charge4;// 电量
-    private BigDecimal loss_flat_peak_char4;// 计损电量
-    private BigDecimal flat_peak_amount4;// 金额
-    private BigDecimal peak_charge4;// 电量
-    private BigDecimal loss_peak_charge4;// 计损电量
-    private BigDecimal peak_amount4;// 金额
-    private BigDecimal low_peak_charge4;// 电量
-    private BigDecimal loss_low_peak_charge4;// 计损电量
-    private BigDecimal low_peak_amount4;// 金额
-    private String time5;// 计费时段
-    private BigDecimal sharp_peak_charge5;// 电量
-    private BigDecimal loss_sharp_peak_charge5;// 计损电量
-    private BigDecimal sharp_peak_amount5;// 金额
-    private BigDecimal flat_peak_charge5;// 电量
-    private BigDecimal loss_flat_peak_char5;// 计损电量
-    private BigDecimal flat_peak_amount5;// 金额
-    private BigDecimal peak_charge5;// 电量
-    private BigDecimal loss_peak_charge5;// 计损电量
-    private BigDecimal peak_amount5;// 金额
-    private BigDecimal low_peak_charge5;// 电量
-    private BigDecimal loss_low_peak_charge5;// 计损电量
-    private BigDecimal low_peak_amount5;// 金额
-    private String time6;// 计费时段
-    private BigDecimal sharp_peak_charge6;// 电量
-    private BigDecimal loss_sharp_peak_charge6;// 计损电量
-    private BigDecimal sharp_peak_amount6;// 金额
-    private BigDecimal flat_peak_charge6;// 电量
-    private BigDecimal loss_flat_peak_char6;// 计损电量
-    private BigDecimal flat_peak_amount6;// 金额
-    private BigDecimal peak_charge6;// 电量
-    private BigDecimal loss_peak_charge6;// 计损电量
-    private BigDecimal peak_amount6;// 金额
-    private BigDecimal low_peak_charge6;// 电量
-    private BigDecimal loss_low_peak_charge6;// 计损电量
-    private BigDecimal low_peak_amount6;// 金额
-    private String time7;// 计费时段
-    private BigDecimal sharp_peak_charge7;// 电量
-    private BigDecimal loss_sharp_peak_charge7;// 计损电量
-    private BigDecimal sharp_peak_amount7;// 金额
-    private BigDecimal flat_peak_charge7;// 电量
-    private BigDecimal loss_flat_peak_char7;// 计损电量
-    private BigDecimal flat_peak_amount7;// 金额
-    private BigDecimal peak_charge7;// 电量
-    private BigDecimal loss_peak_charge7;// 计损电量
-    private BigDecimal peak_amount7;// 金额
-    private BigDecimal low_peak_charge7;// 电量
-    private BigDecimal loss_low_peak_charge7;// 计损电量
-    private BigDecimal low_peak_amount7;// 金额
-    private String time8;// 计费时段
-    private BigDecimal sharp_peak_charge8;// 电量
-    private BigDecimal loss_sharp_peak_charge8;// 计损电量
-    private BigDecimal sharp_peak_amount8;// 金额
-    private BigDecimal flat_peak_charge8;// 电量
-    private BigDecimal loss_flat_peak_char8;// 计损电量
-    private BigDecimal flat_peak_amount8;// 金额
-    private BigDecimal peak_charge8;// 电量
-    private BigDecimal loss_peak_charge8;// 计损电量
-    private BigDecimal peak_amount8;// 金额
-    private BigDecimal low_peak_charge8;// 电量
-    private BigDecimal loss_low_peak_charge8;// 计损电量
-    private BigDecimal low_peak_amount8;// 金额
-    private String time9;// 计费时段
-    private BigDecimal sharp_peak_charge9;// 电量
-    private BigDecimal loss_sharp_peak_charge9;// 计损电量
-    private BigDecimal sharp_peak_amount9;// 金额
-    private BigDecimal flat_peak_charge9;// 电量
-    private BigDecimal loss_flat_peak_char9;// 计损电量
-    private BigDecimal flat_peak_amount9;// 金额
-    private BigDecimal peak_charge9;// 电量
-    private BigDecimal loss_peak_charge9;// 计损电量
-    private BigDecimal peak_amount9;// 金额
-    private BigDecimal low_peak_charge9;// 电量
-    private BigDecimal loss_low_peak_charge9;// 计损电量
-    private BigDecimal low_peak_amount9;// 金额
-    private String time10;// 计费时段
-    private BigDecimal sharp_peak_charge10;// 电量
-    private BigDecimal loss_sharp_peak_charge10;// 计损电量
-    private BigDecimal sharp_peak_amount10;// 金额
-    private BigDecimal flat_peak_charge10;// 电量
-    private BigDecimal loss_flat_peak_char10;// 计损电量
-    private BigDecimal flat_peak_amount10;// 金额
-    private BigDecimal peak_charge10;// 电量
-    private BigDecimal loss_peak_charge10;// 计损电量
-    private BigDecimal peak_amount10;// 金额
-    private BigDecimal low_peak_charge10;// 电量
-    private BigDecimal loss_low_peak_charge10;// 计损电量
-    private BigDecimal low_peak_amount10;// 金额
-    private String time11;// 计费时段
-    private BigDecimal sharp_peak_charge11;// 电量
-    private BigDecimal loss_sharp_peak_charge11;// 计损电量
-    private BigDecimal sharp_peak_amount11;// 金额
-    private BigDecimal flat_peak_charge11;// 电量
-    private BigDecimal loss_flat_peak_char11;// 计损电量
-    private BigDecimal flat_peak_amount11;// 金额
-    private BigDecimal peak_charge11;// 电量
-    private BigDecimal loss_peak_charge11;// 计损电量
-    private BigDecimal peak_amount11;// 金额
-    private BigDecimal low_peak_charge11;// 电量
-    private BigDecimal loss_low_peak_charge11;// 计损电量
-    private BigDecimal low_peak_amount11;// 金额
-    private String time12;// 计费时段
-    private BigDecimal sharp_peak_charge12;// 电量
-    private BigDecimal loss_sharp_peak_charge12;// 计损电量
-    private BigDecimal sharp_peak_amount12;// 金额
-    private BigDecimal flat_peak_charge12;// 电量
-    private BigDecimal loss_flat_peak_char12;// 计损电量
-    private BigDecimal flat_peak_amount12;// 金额
-    private BigDecimal peak_charge12;// 电量
-    private BigDecimal loss_peak_charge12;// 计损电量
-    private BigDecimal peak_amount12;// 金额
-    private BigDecimal low_peak_charge12;// 电量
-    private BigDecimal loss_low_peak_charge12;// 计损电量
-    private BigDecimal low_peak_amount12;// 金额
+    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;// 谷金额
 }
 
 
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
index 7303821..d664eb8 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java
@@ -16,172 +16,169 @@
     private String charging_gun_code;// 抢号
     private String start_time;// 开始时间
     private String end_time;// 结束时间
-    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 time1;// 计费时段
-    private BigDecimal sharp_peak_charge1;// 尖电量
-    private BigDecimal loss_sharp_peak_charge1;// 计损尖电量
-    private BigDecimal sharp_peak_amount1;// 尖金额
-    private BigDecimal flat_peak_charge1;// 平电量
-    private BigDecimal loss_flat_peak_char1;// 计损平电量
-    private BigDecimal flat_peak_amount1;// 平金额
+    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 low_peak_charge1;// 谷电量
-    private BigDecimal loss_low_peak_charge1;// 计损谷电量
-    private BigDecimal low_peak_amount1;// 谷金额
-    private String time2;// 计费时段
-    private BigDecimal sharp_peak_charge2;// 电量
-    private BigDecimal loss_sharp_peak_charge2;// 计损电量
-    private BigDecimal sharp_peak_amount2;// 金额
-    private BigDecimal flat_peak_charge2;// 电量
-    private BigDecimal loss_flat_peak_char2;// 计损电量
-    private BigDecimal flat_peak_amount2;// 金额
-    private BigDecimal peak_charge2;// 电量
-    private BigDecimal loss_peak_charge2;// 计损电量
-    private BigDecimal peak_amount2;// 金额
-    private BigDecimal low_peak_charge2;// 电量
-    private BigDecimal loss_low_peak_charge2;// 计损电量
-    private BigDecimal low_peak_amount2;// 金额
-    private String time3;// 计费时段
-    private BigDecimal sharp_peak_charge3;// 电量
-    private BigDecimal loss_sharp_peak_charge3;// 计损电量
-    private BigDecimal sharp_peak_amount3;// 金额
-    private BigDecimal flat_peak_charge3;// 电量
-    private BigDecimal loss_flat_peak_char3;// 计损电量
-    private BigDecimal flat_peak_amount3;// 金额
-    private BigDecimal peak_charge3;// 电量
-    private BigDecimal loss_peak_charge3;// 计损电量
-    private BigDecimal peak_amount3;// 金额
-    private BigDecimal low_peak_charge3;// 电量
-    private BigDecimal loss_low_peak_charge3;// 计损电量
-    private BigDecimal low_peak_amount3;// 金额
-    private String time4;// 计费时段
-    private BigDecimal sharp_peak_charge4;// 电量
-    private BigDecimal loss_sharp_peak_charge4;// 计损电量
-    private BigDecimal sharp_peak_amount4;// 金额
-    private BigDecimal flat_peak_charge4;// 电量
-    private BigDecimal loss_flat_peak_char4;// 计损电量
-    private BigDecimal flat_peak_amount4;// 金额
-    private BigDecimal peak_charge4;// 电量
-    private BigDecimal loss_peak_charge4;// 计损电量
-    private BigDecimal peak_amount4;// 金额
-    private BigDecimal low_peak_charge4;// 电量
-    private BigDecimal loss_low_peak_charge4;// 计损电量
-    private BigDecimal low_peak_amount4;// 金额
-    private String time5;// 计费时段
-    private BigDecimal sharp_peak_charge5;// 电量
-    private BigDecimal loss_sharp_peak_charge5;// 计损电量
-    private BigDecimal sharp_peak_amount5;// 金额
-    private BigDecimal flat_peak_charge5;// 电量
-    private BigDecimal loss_flat_peak_char5;// 计损电量
-    private BigDecimal flat_peak_amount5;// 金额
-    private BigDecimal peak_charge5;// 电量
-    private BigDecimal loss_peak_charge5;// 计损电量
-    private BigDecimal peak_amount5;// 金额
-    private BigDecimal low_peak_charge5;// 电量
-    private BigDecimal loss_low_peak_charge5;// 计损电量
-    private BigDecimal low_peak_amount5;// 金额
-    private String time6;// 计费时段
-    private BigDecimal sharp_peak_charge6;// 电量
-    private BigDecimal loss_sharp_peak_charge6;// 计损电量
-    private BigDecimal sharp_peak_amount6;// 金额
-    private BigDecimal flat_peak_charge6;// 电量
-    private BigDecimal loss_flat_peak_char6;// 计损电量
-    private BigDecimal flat_peak_amount6;// 金额
-    private BigDecimal peak_charge6;// 电量
-    private BigDecimal loss_peak_charge6;// 计损电量
-    private BigDecimal peak_amount6;// 金额
-    private BigDecimal low_peak_charge6;// 电量
-    private BigDecimal loss_low_peak_charge6;// 计损电量
-    private BigDecimal low_peak_amount6;// 金额
-    private String time7;// 计费时段
-    private BigDecimal sharp_peak_charge7;// 电量
-    private BigDecimal loss_sharp_peak_charge7;// 计损电量
-    private BigDecimal sharp_peak_amount7;// 金额
-    private BigDecimal flat_peak_charge7;// 电量
-    private BigDecimal loss_flat_peak_char7;// 计损电量
-    private BigDecimal flat_peak_amount7;// 金额
-    private BigDecimal peak_charge7;// 电量
-    private BigDecimal loss_peak_charge7;// 计损电量
-    private BigDecimal peak_amount7;// 金额
-    private BigDecimal low_peak_charge7;// 电量
-    private BigDecimal loss_low_peak_charge7;// 计损电量
-    private BigDecimal low_peak_amount7;// 金额
-    private String time8;// 计费时段
-    private BigDecimal sharp_peak_charge8;// 电量
-    private BigDecimal loss_sharp_peak_charge8;// 计损电量
-    private BigDecimal sharp_peak_amount8;// 金额
-    private BigDecimal flat_peak_charge8;// 电量
-    private BigDecimal loss_flat_peak_char8;// 计损电量
-    private BigDecimal flat_peak_amount8;// 金额
-    private BigDecimal peak_charge8;// 电量
-    private BigDecimal loss_peak_charge8;// 计损电量
-    private BigDecimal peak_amount8;// 金额
-    private BigDecimal low_peak_charge8;// 电量
-    private BigDecimal loss_low_peak_charge8;// 计损电量
-    private BigDecimal low_peak_amount8;// 金额
-    private String time9;// 计费时段
-    private BigDecimal sharp_peak_charge9;// 电量
-    private BigDecimal loss_sharp_peak_charge9;// 计损电量
-    private BigDecimal sharp_peak_amount9;// 金额
-    private BigDecimal flat_peak_charge9;// 电量
-    private BigDecimal loss_flat_peak_char9;// 计损电量
-    private BigDecimal flat_peak_amount9;// 金额
-    private BigDecimal peak_charge9;// 电量
-    private BigDecimal loss_peak_charge9;// 计损电量
-    private BigDecimal peak_amount9;// 金额
-    private BigDecimal low_peak_charge9;// 电量
-    private BigDecimal loss_low_peak_charge9;// 计损电量
-    private BigDecimal low_peak_amount9;// 金额
-    private String time10;// 计费时段
-    private BigDecimal sharp_peak_charge10;// 电量
-    private BigDecimal loss_sharp_peak_charge10;// 计损电量
-    private BigDecimal sharp_peak_amount10;// 金额
-    private BigDecimal flat_peak_charge10;// 电量
-    private BigDecimal loss_flat_peak_char10;// 计损电量
-    private BigDecimal flat_peak_amount10;// 金额
-    private BigDecimal peak_charge10;// 电量
-    private BigDecimal loss_peak_charge10;// 计损电量
-    private BigDecimal peak_amount10;// 金额
-    private BigDecimal low_peak_charge10;// 电量
-    private BigDecimal loss_low_peak_charge10;// 计损电量
-    private BigDecimal low_peak_amount10;// 金额
-    private String time11;// 计费时段
-    private BigDecimal sharp_peak_charge11;// 电量
-    private BigDecimal loss_sharp_peak_charge11;// 计损电量
-    private BigDecimal sharp_peak_amount11;// 金额
-    private BigDecimal flat_peak_charge11;// 电量
-    private BigDecimal loss_flat_peak_char11;// 计损电量
-    private BigDecimal flat_peak_amount11;// 金额
-    private BigDecimal peak_charge11;// 电量
-    private BigDecimal loss_peak_charge11;// 计损电量
-    private BigDecimal peak_amount11;// 金额
-    private BigDecimal low_peak_charge11;// 电量
-    private BigDecimal loss_low_peak_charge11;// 计损电量
-    private BigDecimal low_peak_amount11;// 金额
-    private String time12;// 计费时段
-    private BigDecimal sharp_peak_charge12;// 电量
-    private BigDecimal loss_sharp_peak_charge12;// 计损电量
-    private BigDecimal sharp_peak_amount12;// 金额
-    private BigDecimal flat_peak_charge12;// 电量
-    private BigDecimal loss_flat_peak_char12;// 计损电量
-    private BigDecimal flat_peak_amount12;// 金额
-    private BigDecimal peak_charge12;// 电量
-    private BigDecimal loss_peak_charge12;// 计损电量
-    private BigDecimal peak_amount12;// 金额
-    private BigDecimal low_peak_charge12;// 电量
-    private BigDecimal loss_low_peak_charge12;// 计损电量
-    private BigDecimal low_peak_amount12;// 金额
+    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;// 谷金额
 
 }
 
diff --git a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
index 2f5a954..728a9f4 100644
--- a/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
+++ b/ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java
@@ -286,7 +286,7 @@
 		//站点
 		long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, ids).eq(Site::getDelFlag, 0));
 		if(count > 0){
-			return AjaxResult.error("该合作商已关联站点不可删除!");
+			return AjaxResult.error("该合作商已关联站点不可删除");
 		}
 		//充电桩
 		long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getPartnerId, ids).eq(TChargingPile::getDelFlag, 0));
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 b851bf4..8c46e37 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
@@ -19,172 +19,169 @@
     private String charging_gun_code;// 抢号
     private String start_time;// 开始时间
     private String end_time;// 结束时间
-    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 time1;// 计费时段
-    private BigDecimal sharp_peak_charge1;// 尖电量
-    private BigDecimal loss_sharp_peak_charge1;// 计损尖电量
-    private BigDecimal sharp_peak_amount1;// 尖金额
-    private BigDecimal flat_peak_charge1;// 平电量
-    private BigDecimal loss_flat_peak_char1;// 计损平电量
-    private BigDecimal flat_peak_amount1;// 平金额
+    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 low_peak_charge1;// 谷电量
-    private BigDecimal loss_low_peak_charge1;// 计损谷电量
-    private BigDecimal low_peak_amount1;// 谷金额
-    private String time2;// 计费时段
-    private BigDecimal sharp_peak_charge2;// 电量
-    private BigDecimal loss_sharp_peak_charge2;// 计损电量
-    private BigDecimal sharp_peak_amount2;// 金额
-    private BigDecimal flat_peak_charge2;// 电量
-    private BigDecimal loss_flat_peak_char2;// 计损电量
-    private BigDecimal flat_peak_amount2;// 金额
-    private BigDecimal peak_charge2;// 电量
-    private BigDecimal loss_peak_charge2;// 计损电量
-    private BigDecimal peak_amount2;// 金额
-    private BigDecimal low_peak_charge2;// 电量
-    private BigDecimal loss_low_peak_charge2;// 计损电量
-    private BigDecimal low_peak_amount2;// 金额
-    private String time3;// 计费时段
-    private BigDecimal sharp_peak_charge3;// 电量
-    private BigDecimal loss_sharp_peak_charge3;// 计损电量
-    private BigDecimal sharp_peak_amount3;// 金额
-    private BigDecimal flat_peak_charge3;// 电量
-    private BigDecimal loss_flat_peak_char3;// 计损电量
-    private BigDecimal flat_peak_amount3;// 金额
-    private BigDecimal peak_charge3;// 电量
-    private BigDecimal loss_peak_charge3;// 计损电量
-    private BigDecimal peak_amount3;// 金额
-    private BigDecimal low_peak_charge3;// 电量
-    private BigDecimal loss_low_peak_charge3;// 计损电量
-    private BigDecimal low_peak_amount3;// 金额
-    private String time4;// 计费时段
-    private BigDecimal sharp_peak_charge4;// 电量
-    private BigDecimal loss_sharp_peak_charge4;// 计损电量
-    private BigDecimal sharp_peak_amount4;// 金额
-    private BigDecimal flat_peak_charge4;// 电量
-    private BigDecimal loss_flat_peak_char4;// 计损电量
-    private BigDecimal flat_peak_amount4;// 金额
-    private BigDecimal peak_charge4;// 电量
-    private BigDecimal loss_peak_charge4;// 计损电量
-    private BigDecimal peak_amount4;// 金额
-    private BigDecimal low_peak_charge4;// 电量
-    private BigDecimal loss_low_peak_charge4;// 计损电量
-    private BigDecimal low_peak_amount4;// 金额
-    private String time5;// 计费时段
-    private BigDecimal sharp_peak_charge5;// 电量
-    private BigDecimal loss_sharp_peak_charge5;// 计损电量
-    private BigDecimal sharp_peak_amount5;// 金额
-    private BigDecimal flat_peak_charge5;// 电量
-    private BigDecimal loss_flat_peak_char5;// 计损电量
-    private BigDecimal flat_peak_amount5;// 金额
-    private BigDecimal peak_charge5;// 电量
-    private BigDecimal loss_peak_charge5;// 计损电量
-    private BigDecimal peak_amount5;// 金额
-    private BigDecimal low_peak_charge5;// 电量
-    private BigDecimal loss_low_peak_charge5;// 计损电量
-    private BigDecimal low_peak_amount5;// 金额
-    private String time6;// 计费时段
-    private BigDecimal sharp_peak_charge6;// 电量
-    private BigDecimal loss_sharp_peak_charge6;// 计损电量
-    private BigDecimal sharp_peak_amount6;// 金额
-    private BigDecimal flat_peak_charge6;// 电量
-    private BigDecimal loss_flat_peak_char6;// 计损电量
-    private BigDecimal flat_peak_amount6;// 金额
-    private BigDecimal peak_charge6;// 电量
-    private BigDecimal loss_peak_charge6;// 计损电量
-    private BigDecimal peak_amount6;// 金额
-    private BigDecimal low_peak_charge6;// 电量
-    private BigDecimal loss_low_peak_charge6;// 计损电量
-    private BigDecimal low_peak_amount6;// 金额
-    private String time7;// 计费时段
-    private BigDecimal sharp_peak_charge7;// 电量
-    private BigDecimal loss_sharp_peak_charge7;// 计损电量
-    private BigDecimal sharp_peak_amount7;// 金额
-    private BigDecimal flat_peak_charge7;// 电量
-    private BigDecimal loss_flat_peak_char7;// 计损电量
-    private BigDecimal flat_peak_amount7;// 金额
-    private BigDecimal peak_charge7;// 电量
-    private BigDecimal loss_peak_charge7;// 计损电量
-    private BigDecimal peak_amount7;// 金额
-    private BigDecimal low_peak_charge7;// 电量
-    private BigDecimal loss_low_peak_charge7;// 计损电量
-    private BigDecimal low_peak_amount7;// 金额
-    private String time8;// 计费时段
-    private BigDecimal sharp_peak_charge8;// 电量
-    private BigDecimal loss_sharp_peak_charge8;// 计损电量
-    private BigDecimal sharp_peak_amount8;// 金额
-    private BigDecimal flat_peak_charge8;// 电量
-    private BigDecimal loss_flat_peak_char8;// 计损电量
-    private BigDecimal flat_peak_amount8;// 金额
-    private BigDecimal peak_charge8;// 电量
-    private BigDecimal loss_peak_charge8;// 计损电量
-    private BigDecimal peak_amount8;// 金额
-    private BigDecimal low_peak_charge8;// 电量
-    private BigDecimal loss_low_peak_charge8;// 计损电量
-    private BigDecimal low_peak_amount8;// 金额
-    private String time9;// 计费时段
-    private BigDecimal sharp_peak_charge9;// 电量
-    private BigDecimal loss_sharp_peak_charge9;// 计损电量
-    private BigDecimal sharp_peak_amount9;// 金额
-    private BigDecimal flat_peak_charge9;// 电量
-    private BigDecimal loss_flat_peak_char9;// 计损电量
-    private BigDecimal flat_peak_amount9;// 金额
-    private BigDecimal peak_charge9;// 电量
-    private BigDecimal loss_peak_charge9;// 计损电量
-    private BigDecimal peak_amount9;// 金额
-    private BigDecimal low_peak_charge9;// 电量
-    private BigDecimal loss_low_peak_charge9;// 计损电量
-    private BigDecimal low_peak_amount9;// 金额
-    private String time10;// 计费时段
-    private BigDecimal sharp_peak_charge10;// 电量
-    private BigDecimal loss_sharp_peak_charge10;// 计损电量
-    private BigDecimal sharp_peak_amount10;// 金额
-    private BigDecimal flat_peak_charge10;// 电量
-    private BigDecimal loss_flat_peak_char10;// 计损电量
-    private BigDecimal flat_peak_amount10;// 金额
-    private BigDecimal peak_charge10;// 电量
-    private BigDecimal loss_peak_charge10;// 计损电量
-    private BigDecimal peak_amount10;// 金额
-    private BigDecimal low_peak_charge10;// 电量
-    private BigDecimal loss_low_peak_charge10;// 计损电量
-    private BigDecimal low_peak_amount10;// 金额
-    private String time11;// 计费时段
-    private BigDecimal sharp_peak_charge11;// 电量
-    private BigDecimal loss_sharp_peak_charge11;// 计损电量
-    private BigDecimal sharp_peak_amount11;// 金额
-    private BigDecimal flat_peak_charge11;// 电量
-    private BigDecimal loss_flat_peak_char11;// 计损电量
-    private BigDecimal flat_peak_amount11;// 金额
-    private BigDecimal peak_charge11;// 电量
-    private BigDecimal loss_peak_charge11;// 计损电量
-    private BigDecimal peak_amount11;// 金额
-    private BigDecimal low_peak_charge11;// 电量
-    private BigDecimal loss_low_peak_charge11;// 计损电量
-    private BigDecimal low_peak_amount11;// 金额
-    private String time12;// 计费时段
-    private BigDecimal sharp_peak_charge12;// 电量
-    private BigDecimal loss_sharp_peak_charge12;// 计损电量
-    private BigDecimal sharp_peak_amount12;// 金额
-    private BigDecimal flat_peak_charge12;// 电量
-    private BigDecimal loss_flat_peak_char12;// 计损电量
-    private BigDecimal flat_peak_amount12;// 金额
-    private BigDecimal peak_charge12;// 电量
-    private BigDecimal loss_peak_charge12;// 计损电量
-    private BigDecimal peak_amount12;// 金额
-    private BigDecimal low_peak_charge12;// 电量
-    private BigDecimal loss_low_peak_charge12;// 计损电量
-    private BigDecimal low_peak_amount12;// 金额
+    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;// 谷金额
 
 
 }
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
index 18e2fbe..e45f691 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/dto/ChargingDetails.java
@@ -34,7 +34,7 @@
 	@ApiModelProperty("已充电度数")
 	private BigDecimal chargedDegrees;
 	@ApiModelProperty("已充电时间")
-	private Integer chargedTime;
+	private String chargedTime;
 	@ApiModelProperty("充电费用")
 	private BigDecimal chargingCost;
 	@ApiModelProperty("充电状态（0=未知，1=等待中，2=启动中，3=充电中，4=停止中，5=已结束）")
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
index 976f694..4d05f8d 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TChargingOrderServiceImpl.java
@@ -933,7 +933,9 @@
 			chargingDetails.setCompletionRatio(data.getSoc());
 			chargingDetails.setRemainingChargeTime(data.getTime_remaining());
 			chargingDetails.setChargedDegrees(data.getCharging_degree());
-			chargingDetails.setChargedTime(data.getCumulative_charging_time());
+			Integer h = Integer.valueOf(data.getCumulative_charging_time() / 60);
+			Integer m = Integer.valueOf(data.getCumulative_charging_time() % 60);
+			chargingDetails.setChargedTime(String.format("%02d", h) + ":" + String.format("%02d", m));
 		}
 		ChargingHandshake chargingHandshake = chargingHandshakeClient.getDataByOrderCode(one.getCode()).getData();
 		if(null != chargingHandshake && null != data && null != one.getAppUserCarId()){
@@ -1778,24 +1780,20 @@
 		
 		//获取订单的计费策略
 		List<AccountingStrategyDetailOrder> accountingStrategyDetailOrderList = accountingStrategyDetailOrderClient.getAllAccountingStrategyDetailOrder(chargingOrder.getId()).getData();
-		AccountingStrategyDetailOrder accountingStrategyDetailOrder = accountingStrategyDetailOrderList.get(accountingStrategyDetailOrderList.size() - 1);
-		if(accountingStrategyDetailOrder.getEndTime().equals("00:00")){
-			accountingStrategyDetailOrder.setEndTime("24:00");
-		}
 		chargingOrderAccountingStrategyService.remove(new LambdaQueryWrapper<TChargingOrderAccountingStrategy>().eq(TChargingOrderAccountingStrategy::getChargingOrderId, chargingOrder.getId()));
 		for (int i = 0; i < 12; i++) {
 			Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
 			try {
-				Object invoke1 = clazz.getMethod("getTime" + (i + 1)).invoke(vo);
+				Object invoke1 = clazz.getMethod("getBilling_model_code" + (i + 1)).invoke(vo);
 				if(null != invoke1){
-					String[] split = invoke1.toString().split("-");
-					AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getStartTime().equals(split[0]) && s.getEndTime().equals(split[1])).findFirst().get();
+					Integer id = Integer.valueOf(invoke1.toString());
+					AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.stream().filter(s -> s.getId().equals(id)).findFirst().get();
 					//阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
 					Object invoke = null;
 					switch (strategyDetail.getType()){
 						case 1:
 							//充电度数
-							invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
+							invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
 							break;
 						case 2:
 							//充电度数
@@ -1803,11 +1801,11 @@
 							break;
 						case 3:
 							//充电度数
-							invoke = clazz.getMethod("getFlat_peak_charge" + (i + 1)).invoke(vo);
+							invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
 							break;
 						case 4:
 							//充电度数
-							invoke = clazz.getMethod("getLow_peak_charge" + (i + 1)).invoke(vo);
+							invoke = clazz.getMethod("getValley_amount" + (i + 1)).invoke(vo);
 							break;
 					}
 					if(null == invoke || invoke.toString().equals("0")){

--
Gitblit v1.7.1