Merge remote-tracking branch 'origin/master'

luodangjia

2024-10-21 0cffe10d0563f7e2c98b4eca1467699244051b07

Merge remote-tracking branch 'origin/master'

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TFaultMessage.java

@@ -8,6 +8,7 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;
@@ -64,6 +65,7 @@

    @ApiModelProperty(value = "故障时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @TableField("down_time")
    private LocalDateTime downTime;
    @ApiModelProperty(value = "结束时间")

 ruoyi-api/ruoyi-api-chargingPile/src/main/java/com/ruoyi/chargingPile/api/model/TRepair.java

@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;

import java.io.Serializable;
import java.time.LocalDateTime;
@@ -54,6 +55,7 @@

    @ApiModelProperty(value = "报修时间")
    @TableField("repair_time")
    @DateTimeFormat(pattern = "yyyy-MM-ddTHH:mm:ss")
    private LocalDateTime repairTime;



 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;// 谷金额
}



 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrderAccountingStrategy.java

@@ -73,7 +73,7 @@
    @TableField("period_electric_price")
    private BigDecimal periodElectricPrice;

    @ApiModelProperty(value = "时段服务费")
    @ApiModelProperty(value = "时段服务费(最终服务费 含折扣)")
    @TableField("period_service_price")
    private BigDecimal periodServicePrice;
    
@@ -93,9 +93,7 @@
    @TableField(exist = false)
    private BigDecimal couponDiscount;

    @ApiModelProperty(value = "最终服务费")
    @TableField(exist = false)
    private BigDecimal finalService;



}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/TransactionRecordMessageVO.java

@@ -16,172 +16,157 @@
    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 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 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 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 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 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 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 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 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 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 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 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 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;// 谷金额

}


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -103,7 +103,7 @@
        {
            if (StringUtils.isNotEmpty(perm))
            {
                permsSet.addAll(Arrays.asList(perm.trim().split(",")));
                permsSet.add(perm);
            }
        }
        return permsSet;

 ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml

@@ -54,7 +54,7 @@
    type: nacos
    nacos:
      # 开发环境
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      data-id: seata-server.properties
@@ -72,7 +72,7 @@
    nacos:
      application: seata-server
      # 开发环境
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      username: nacos
@@ -87,7 +87,7 @@
    nacos:
      discovery:
        # 开发环境
        server-addr: 127.0.0.1:8848 # nacos注册中心地址
        server-addr: 192.168.110.169:8848 # nacos注册中心地址
        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
        group: DEFAULT_GROUP
        application: seata-server #Nacos 中 Seata 名称

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -96,14 +96,14 @@
    </select>
    
    <select id="selectMenuPerms" resultType="String">
        select distinct m.perms
        select distinct m.path
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
             left join sys_user_role ur on rm.role_id = ur.role_id
    </select>

    <select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
        select distinct m.perms
        select distinct m.path
        from sys_menu m
             left join sys_role_menu rm on m.menu_id = rm.menu_id
             left join sys_user_role ur on rm.role_id = ur.role_id

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserController.java

@@ -370,7 +370,7 @@
            }
            if(appUser.getCityCode()!=null){
                Region data = otherClient.getRegionBuyCode(appUser.getCityCode()).getData();
                appUser.setProvince(data.getName());
                appUser.setCity(data.getName());
            }
            //拿到最新的tagId
            TAppUserTag one = appUserTagService.lambdaQuery().eq(TAppUserTag::getAppUserId, appUser.getId()).orderByDesc(TAppUserTag::getCreateTime).last("limit 1").one();

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/PartnerServiceImpl.java

@@ -284,12 +284,12 @@
    public AjaxResult delPartner(List<Integer> ids) {
        //查询有无关联数据
        //站点
        long count = siteService.count(new LambdaQueryWrapper<Site>().in(Site::getPartnerId, Arrays.asList(ids)).eq(Site::getDelFlag, 0));
        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, Arrays.asList(ids)).eq(TChargingPile::getDelFlag, 0));
        long count1 = chargingPileService.count(new LambdaQueryWrapper<TChargingPile>().in(TChargingPile::getPartnerId, ids).eq(TChargingPile::getDelFlag, 0));
        if(count1 > 0){
            return AjaxResult.error("该合作商已关联充电桩不可删除!");
        }
@@ -298,7 +298,7 @@
            if(null == partner){
                return AjaxResult.error("删除失败");
            }
            this.removeById(partner);
            this.removeById(id);
            SysUser user = sysUserClient.queryUserByUserName(partner.getAccount()).getData();
            user.setDelFlag("2");
            sysUserClient.updateUser(user);
@@ -338,6 +338,9 @@
    @Override
    public GetPermissionConfigurationDTO getPermissionConfiguration(Integer siteId, Integer partnerId) {
        Partner partner = this.getById(partnerId);
        if(null == partner){
            throw new RuntimeException("该站点合作商无效");
        }
        GetPermissionConfigurationDTO dto = new GetPermissionConfigurationDTO();
        dto.setPermissionRemarks(partner.getPermissionRemarks());
        List<TPartnerSite> list = partnerSiteService.list(new LambdaQueryWrapper<TPartnerSite>()

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TChargingGunServiceImpl.java

@@ -7,6 +7,8 @@
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TAccountingStrategy;
import com.ruoyi.chargingPile.api.feignClient.SiteClient;
import com.ruoyi.chargingPile.api.model.Site;
import com.ruoyi.chargingPile.api.model.TChargingGun;
import com.ruoyi.chargingPile.api.model.TChargingPile;
import com.ruoyi.chargingPile.api.query.TChargingGunQuery;
@@ -69,11 +71,11 @@
    
    @Resource
    private SendMessageClient sendMessageClient;
    

    @Resource
    private SiteClient siteClient;

    

    
    
    @Override

 ruoyi-service/ruoyi-chargingPile/src/main/java/com/ruoyi/chargingPile/service/impl/TFaultMessageServiceImpl.java

@@ -18,6 +18,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.time.LocalDateTime;
import java.util.List;

/**
@@ -52,6 +53,7 @@
            siteName = siteName.substring(0,10);
        }
        chargingPileNotificationService.saveData(4,dto.getSiteId(),dto.getChargingPileId(),site.getPhone(),"检测到"+siteName+"..."+chargingPile.getNumber()+"号桩设备离线，请及时查看处理！");
        dto.setDownTime(LocalDateTime.now());
        this.save(dto);
    }
    

 ruoyi-service/ruoyi-chargingPile/src/main/resources/bootstrap.yml

@@ -55,7 +55,7 @@
    type: nacos
    nacos:
      # 开发环境
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      data-id: seata-server.properties
@@ -73,7 +73,7 @@
    nacos:
      application: seata-server
      # 开发环境
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      username: nacos
@@ -88,7 +88,7 @@
    nacos:
      discovery:
        # 开发环境
        server-addr: 127.0.0.1:8848 # nacos注册中心地址
        server-addr: 192.168.110.169:8848
        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
        group: DEFAULT_GROUP
        application: seata-server #Nacos 中 Seata 名称

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java

@@ -7,6 +7,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;

@@ -72,7 +73,7 @@


    @PostMapping(value = "/getAll")
    public R<List<UploadRealTimeMonitoringData>> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery){
    public R<List<UploadRealTimeMonitoringData>> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
        List<UploadRealTimeMonitoringData> list = uploadRealTimeMonitoringDataService.getDataAll(mongoChargingOrderQuery);
        return R.ok(list);
    }

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/UploadRealTimeMonitoringDataService.java

@@ -4,6 +4,7 @@
import com.ruoyi.integration.mongodb.base.BaseService;
import com.ruoyi.common.core.dto.MongoChargingOrderQuery;

import java.text.ParseException;
import java.util.List;

public interface UploadRealTimeMonitoringDataService extends BaseService<UploadRealTimeMonitoringData> {
@@ -14,7 +15,7 @@
     * @return
     */
    List<UploadRealTimeMonitoringData> getDataByOrderCode(String code);
    List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery);
    List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException;

    /**
     * 查询订单最新一条数据

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java

@@ -14,6 +14,9 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;

@Service
@@ -57,7 +60,7 @@
    }

    @Override
    public List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) {
    public List<UploadRealTimeMonitoringData> getDataAll(MongoChargingOrderQuery mongoChargingOrderQuery) throws ParseException {
        Query query = new Query();
//        if (!values.isEmpty()){
//            query.addCriteria(Criteria.where("transaction_serial_number").in(values));
@@ -83,13 +86,19 @@

        if (mongoChargingOrderQuery.getStartTime() != null) {
            String[] split = mongoChargingOrderQuery.getStartTime().split(" - ");
            query.addCriteria(Criteria.where("startTime").gte(split[0]).lt(split[1]));

            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date start = dateFormat.parse(split[0]);
            Date end = dateFormat.parse(split[1]);
            query.addCriteria(Criteria.where("startTime").gte(start).lt(end));
        }

        if (mongoChargingOrderQuery.getEndTime() != null && mongoChargingOrderQuery.getEndTime() != null) {
            String[] split = mongoChargingOrderQuery.getEndTime().split(" - ");

            query.addCriteria(Criteria.where("lastTime").gte(split[0]).lt(split[1]));
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            Date start = dateFormat.parse(split[0]);
            Date end = dateFormat.parse(split[1]);
            query.addCriteria(Criteria.where("lastTime").gte(start).lt(end));
        }



 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;// 谷金额


}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -310,17 +310,36 @@
    @PostMapping(value = "/chargingOrderInfo")
    @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {
        TChargingOrder byId = chargingOrderService.getById(orderId);
        ChargingOrderInfoVO chargingOrderInfoVO = new ChargingOrderInfoVO();
        chargingOrderInfoVO.setCdElectronic("");
        chargingOrderInfoVO.setCdVoltage("");
        chargingOrderInfoVO.setSurplus("");
        chargingOrderInfoVO.setTotalPower("");
        chargingOrderInfoVO.setLicensePlate("");
        chargingOrderInfoVO.setVehicleBrand("");
        chargingOrderInfoVO.setVehicleModel("");
        chargingOrderInfoVO.setVehicleUse("");
        List<TChargingOrderAccountingStrategy> tChargingOrderAccountingStrategies = new ArrayList<>();
        chargingOrderInfoVO.setList(tChargingOrderAccountingStrategies);
        chargingOrderInfoVO.setCdElectronic(byId.getCurrent()+"");
        chargingOrderInfoVO.setCdVoltage(byId.getVoltage()+"");
        chargingOrderInfoVO.setSurplus(byId.getTotalElectricity()+"");
        chargingOrderInfoVO.setTotalPower(byId.getPower()+"");
        if (byId.getAppUserCarId()!=null){
            List<TAppUserCar> data = appUserCarClient.getCarByIds(Collections.singletonList(byId.getAppUserCarId())).getData();
            if (!data.isEmpty()){
                chargingOrderInfoVO.setLicensePlate(data.get(0).getLicensePlate());
                chargingOrderInfoVO.setVehicleBrand(data.get(0).getVehicleBrand());
                chargingOrderInfoVO.setVehicleModel(data.get(0).getVehicleModel());
                chargingOrderInfoVO.setVehicleUse(data.get(0).getVehicleUse());
            }
        }
        // 时段总服务费
        BigDecimal bigDecimal = new BigDecimal("0");
        List<TChargingOrderAccountingStrategy> list = chargingOrderAccountingStrategyService.lambdaQuery().eq(TChargingOrderAccountingStrategy::getChargingOrderId, orderId).orderByDesc(TChargingOrderAccountingStrategy::getStartTime).list();
        for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
            bigDecimal = bigDecimal.add(tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice());
            tChargingOrderAccountingStrategy.setVipDiscount(
                    tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()
                            .subtract(tChargingOrderAccountingStrategy.getPeriodServicePrice())
            );
            tChargingOrderAccountingStrategy.setCouponDiscount(
                    tChargingOrderAccountingStrategy.getPeriodOriginalServicePrice()
                            .subtract(tChargingOrderAccountingStrategy.getPeriodServicePrice())
            );
        }
        chargingOrderInfoVO.setList(list);
        return AjaxResult.success(chargingOrderInfoVO);
    }


 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=已结束）")

 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()){
@@ -1281,7 +1283,7 @@
            BigDecimal serviceMoney1 = new BigDecimal("0");
            UploadRealTimeMonitoringData data5 = uploadRealTimeMonitoringDataClient.chargingOrderInfo(chargingOrderVO.getCode()).getData();
            if (data5!=null){
                chargingOrderVO.setChargingSecond(data5.getTime_remaining()*60L);
                chargingOrderVO.setChargingSecond(data5.getCumulative_charging_time()*60L);
            }
            // 总收入
            if (chargingOrderVO.getRefundStatus() !=null && chargingOrderVO.getRefundStatus() == 2){
@@ -1778,72 +1780,64 @@
        
        //获取订单的计费策略
        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++) {
        for (int i = 0; i < accountingStrategyDetailOrderList.size(); i++) {
            Class<? extends TransactionRecordMessageVO> clazz = vo.getClass();
            try {
                Object invoke1 = clazz.getMethod("getTime" + (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();
                    //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
                    Object invoke = null;
                    switch (strategyDetail.getType()){
                        case 1:
                            //充电度数
                            invoke = clazz.getMethod("getSharp_peak_charge" + (i + 1)).invoke(vo);
                            break;
                        case 2:
                            //充电度数
                            invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
                            break;
                        case 3:
                            //充电度数
                            invoke = clazz.getMethod("getFlat_peak_charge" + (i + 1)).invoke(vo);
                            break;
                        case 4:
                            //充电度数
                            invoke = clazz.getMethod("getLow_peak_charge" + (i + 1)).invoke(vo);
                            break;
                    }
                    if(null == invoke || invoke.toString().equals("0")){
                        continue;
                    }
                    BigDecimal Sharp_peak_charge = new BigDecimal(invoke.toString());
                    TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
                    chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
                    chargingOrderAccountingStrategy.setAccountingStrategyDetailId(strategyDetail.getId());
                    chargingOrderAccountingStrategy.setType(strategyDetail.getType());
                    chargingOrderAccountingStrategy.setStartTime(chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")));
                    chargingOrderAccountingStrategy.setEndTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm")));
                    chargingOrderAccountingStrategy.setElectrovalence(strategyDetail.getElectrovalence());
                    chargingOrderAccountingStrategy.setServiceCharge(strategyDetail.getServiceCharge());
                    chargingOrderAccountingStrategy.setCostServiceCharge(strategyDetail.getCostServiceCharge());
                    //已充电总度数
                    BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(Sharp_peak_charge);
                    BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(Sharp_peak_charge);
                    BigDecimal serviceCharge = originalServicePrice;
                    //计算优惠金额
                    if(null != chargingOrder.getVipDiscount()){
                        serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount().divide(new BigDecimal(10)));
                    }
                    chargingOrderAccountingStrategy.setChargingCapacity(Sharp_peak_charge);
                    chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc);
                    chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge);
                    chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice);
                    chargingOrderAccountingStrategy.setCreateTime(LocalDateTime.now());
                    chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy);
					
                    BigDecimal periodElectricPrice = chargingOrderAccountingStrategy.getPeriodElectricPrice();
                    BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodOriginalServicePrice();
                    periodElectricPrice_total = periodElectricPrice_total.add(periodElectricPrice);
                    periodServicePrice_total = periodServicePrice_total.add(periodServicePrice);
                    total = total.add(periodElectricPrice).add(periodServicePrice);
                AccountingStrategyDetailOrder strategyDetail = accountingStrategyDetailOrderList.get(i);
                //阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）
                Object invoke = null;
                switch (strategyDetail.getType()){
                    case 1:
                        //充电度数
                        invoke = clazz.getMethod("getSpike_charge" + (i + 1)).invoke(vo);
                        break;
                    case 2:
                        //充电度数
                        invoke = clazz.getMethod("getPeak_charge" + (i + 1)).invoke(vo);
                        break;
                    case 3:
                        //充电度数
                        invoke = clazz.getMethod("getFlat_charge" + (i + 1)).invoke(vo);
                        break;
                    case 4:
                        //充电度数
                        invoke = clazz.getMethod("getValley_charge" + (i + 1)).invoke(vo);
                        break;
                }
                if(null == invoke || Integer.valueOf(invoke.toString()) == 0){
                    continue;
                }
                BigDecimal sharp_peak_charge = new BigDecimal(invoke.toString());
                TChargingOrderAccountingStrategy chargingOrderAccountingStrategy = new TChargingOrderAccountingStrategy();
                chargingOrderAccountingStrategy.setChargingOrderId(chargingOrder.getId());
                chargingOrderAccountingStrategy.setAccountingStrategyDetailId(strategyDetail.getId());
                chargingOrderAccountingStrategy.setType(strategyDetail.getType());
                chargingOrderAccountingStrategy.setStartTime(chargingOrder.getStartTime().format(DateTimeFormatter.ofPattern("HH:mm")));
                chargingOrderAccountingStrategy.setEndTime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm")));
                chargingOrderAccountingStrategy.setElectrovalence(strategyDetail.getElectrovalence());
                chargingOrderAccountingStrategy.setServiceCharge(strategyDetail.getServiceCharge());
                chargingOrderAccountingStrategy.setCostServiceCharge(strategyDetail.getCostServiceCharge());
                //已充电总度数
                BigDecimal electrovalenc = strategyDetail.getElectrovalence().multiply(sharp_peak_charge).setScale(2, RoundingMode.DOWN);
                BigDecimal originalServicePrice = strategyDetail.getServiceCharge().multiply(sharp_peak_charge).setScale(2, RoundingMode.DOWN);
                BigDecimal serviceCharge = originalServicePrice;
                //计算优惠金额
                if(null != chargingOrder.getVipDiscount()){
                    serviceCharge = serviceCharge.multiply(chargingOrder.getVipDiscount().divide(new BigDecimal(10))).setScale(2, RoundingMode.DOWN);
                }
                chargingOrderAccountingStrategy.setChargingCapacity(sharp_peak_charge);
                chargingOrderAccountingStrategy.setPeriodElectricPrice(electrovalenc);
                chargingOrderAccountingStrategy.setPeriodServicePrice(serviceCharge);
                chargingOrderAccountingStrategy.setPeriodOriginalServicePrice(originalServicePrice);
                chargingOrderAccountingStrategy.setCreateTime(LocalDateTime.now());
                chargingOrderAccountingStrategyService.save(chargingOrderAccountingStrategy);
				
                BigDecimal periodElectricPrice = chargingOrderAccountingStrategy.getPeriodElectricPrice();
                BigDecimal periodServicePrice = chargingOrderAccountingStrategy.getPeriodOriginalServicePrice();
                periodElectricPrice_total = periodElectricPrice_total.add(periodElectricPrice);
                periodServicePrice_total = periodServicePrice_total.add(periodServicePrice);
                total = total.add(periodElectricPrice.add(periodServicePrice));
            } catch (IllegalAccessException e) {
                throw new RuntimeException(e);
            } catch (InvocationTargetException e) {
@@ -1904,11 +1898,12 @@
        order.setStartTime(LocalDateTime.parse(vo.getStart_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
        order.setEndTime(LocalDateTime.parse(vo.getEnd_time(), DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SS")));
        order.setStatus(5);
        order.setOrderAmount(orderAmount.setScale(2, RoundingMode.DOWN));
        order.setVipDiscountAmount(discountAmount.setScale(2, RoundingMode.DOWN));
        order.setServiceCharge(periodServicePrice_total.setScale(2, RoundingMode.DOWN));
        order.setElectrovalence(periodElectricPrice_total.setScale(2, RoundingMode.DOWN));
        order.setOrderAmount(orderAmount);
        order.setVipDiscountAmount(discountAmount);
        order.setServiceCharge(periodServicePrice_total);
        order.setElectrovalence(periodElectricPrice_total);
        order.setChargingCapacity(vo.getTotal_electricity());
        order.setElectricity(vo.getTotal_electricity());
        
        //计算优惠券
        if(null != chargingOrder.getAppCouponId()){
@@ -1945,8 +1940,8 @@
                }
            }
        }
        order.setPaymentAmount(payAmount.setScale(2, RoundingMode.DOWN));
        order.setRefundAmount(refundAmount.setScale(2, RoundingMode.DOWN));
        order.setPaymentAmount(payAmount);
        order.setRefundAmount(refundAmount);
        order.setRefundStatus(1);
        this.updateById(order);
        chargingOrder = this.getById(order.getId());

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TOrderInvoiceServiceImpl.java

@@ -215,7 +215,7 @@
                myChargingOrderList.setEndMode(tChargingOrder.getEndMode());
                BigDecimal payMoney = tChargingOrder.getStatus() < 4 ? tChargingOrder.getRechargeAmount() : tChargingOrder.getPaymentAmount();
                myChargingOrderList.setPayMoney(payMoney);
                myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                myChargingOrderList.setCreateTime(tChargingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
                chargingOrder.add(myChargingOrderList);
            }
            myOrderInvoiceInfo.setChargingOrder(chargingOrder);
@@ -245,6 +245,7 @@
                myShoppingOrderList.setUnitPrice(unitPrice);
                myShoppingOrderList.setNumber(tShoppingOrder.getPurchaseQuantity());
                myShoppingOrderList.setPaymentAmount(tShoppingOrder.getPaymentAmount());
                myShoppingOrderList.setCreateTime(tShoppingOrder.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm:ss")));
                shoppingOrder.add(myShoppingOrderList);
            }
            myOrderInvoiceInfo.setShoppingOrder(shoppingOrder);
@@ -295,6 +296,8 @@
                if (e.getBillingUserId()!=null){
                    e.setUserPhone(finalTAppUsers.stream().filter(t->t.getId()!=null).filter(m->m.getId().equals(Long.parseLong(e.getBillingUserId().toString()))).findFirst().get().getPhone());
                }
                TAppUser appUser = appUserClient.getUserById(e.getAppUserId()).getData();
                e.setUserPhone(appUser.getPhone());
            });
        }


 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/TShoppingOrderServiceImpl.java

@@ -202,7 +202,7 @@
    public Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query) {
        Long userId = tokenService.getLoginUserApplet().getUserId();
        LambdaQueryWrapper<TShoppingOrder> wrapper = new LambdaQueryWrapper<TShoppingOrder>().eq(TShoppingOrder::getDelFlag, 0)
                .eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2);
                .eq(TShoppingOrder::getAppUserId, userId).eq(TShoppingOrder::getPaymentStatus, 2).notIn(TShoppingOrder::getStatus, Arrays.asList(4, 5));
        if(query.getStatus() != 0){
            wrapper.eq(TShoppingOrder::getStatus, query.getStatus());
        }
@@ -255,7 +255,7 @@
        TAppUserAddress userAddress = appUserAddressClient.getAppUserAddressById(shoppingOrder.getAppUserAddressId()).getData();
        info.setConsignee(userAddress.getName());
        info.setPhone(userAddress.getPhone());
        info.setAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getAddress());
        info.setAddress(userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getAddress() + userAddress.getHouseNumber());
        info.setExpressCompany(shoppingOrder.getExpressCompany());
        info.setExpressNumber(shoppingOrder.getExpressNumber());
        String name = "";
@@ -372,8 +372,8 @@
            model.setOut_trade_no(shoppingOrder.getCode());
            model.setTransaction_id(shoppingOrder.getSerialNumber());
            model.setOut_refund_no(shoppingOrderRefund.getRefundCode());
            model.setReason("取消订单");
            model.setNotify_url("/order/t-shopping-order/cancelShoppingOrderWxRefund");
            model.setReason("取消商城订单");
            model.setNotify_url("/payment/wx/refund/notify");
            WxPaymentRefundModel.RefundAmount amount = new WxPaymentRefundModel.RefundAmount();
            amount.setRefund(refundAmount.multiply(new BigDecimal(100)).intValue());
            amount.setTotal(shoppingOrder.getPaymentAmount().multiply(new BigDecimal(100)).intValue());
@@ -390,7 +390,7 @@
            dto.setOutTradeNo(shoppingOrder.getCode());
            dto.setOutRequestNo(shoppingOrderRefund.getCode());
            dto.setRefundAmount(refundAmount.toString());
            dto.setRefundReason("取消订单");
            dto.setRefundReason("取消商城订单");
            RefundResp resp = aliPaymentClient.refund(dto).getData();
            if(null != resp){
                this.updateById(shoppingOrder);

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java

@@ -44,7 +44,10 @@
        System.err.println(string);
    }
    // 每月2号凌晨12点执行的定时任务
    @Scheduled(cron = "0 0 0 2 * ?")
//    @Scheduled(cron = "0 0 0 2 * ?")
    // 每天凌晨12点执行的定时任务

    @Scheduled(cron = "0 0 12 2 * ?")
    public void taskMonth() {
        try {
            // 获取上个月的开始和结束日期

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TChargingOrderMapper.xml

@@ -326,7 +326,7 @@
            FROM
            t_charging_order
            <where>
                del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
                del_flag = 0 and recharge_payment_status = 2
                <if test="sixBefore != null">
                    AND create_time &gt;= #{sixBefore}
                </if>
@@ -349,7 +349,7 @@
        FROM
            t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
            del_flag = 0 and recharge_payment_status = 2
            <if test="siteIds != null and siteIds.size() > 0">
                AND site_id IN
                <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">
@@ -368,7 +368,7 @@
    <select id="countAll" resultType="java.util.Map">
        select sum(electrovalence) as electrovalence,sum(service_charge) as service_charge,sum(commission_amount) as commission_amount,sum(sharing_amount) as sharing_amount
        from t_charging_order
        where create_time &gt;= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
        where create_time &gt;= #{sixBefore} and del_flag = 0 and recharge_payment_status = 2
    </select>
    <select id="getSumByType" resultType="java.util.Map">
        SELECT
@@ -399,7 +399,7 @@
        FROM
            t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and DATE(create_time) = CURDATE()
            del_flag = 0 and recharge_payment_status = 2  and DATE(create_time) = CURDATE()
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -423,7 +423,7 @@
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
            del_flag = 0 and recharge_payment_status = 2  and YEARWEEK(DATE_FORMAT(create_time, '%Y-%m-%d'), 1) = YEARWEEK(NOW(), 1)
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -447,7 +447,7 @@
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and MONTH(create_time) = MONTH(NOW())  AND YEAR(create_time) = YEAR(NOW())
            del_flag = 0 and recharge_payment_status = 2  and MONTH(create_time) = MONTH(NOW())  AND YEAR(create_time) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -472,7 +472,7 @@
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status) and YEAR(create_time) = YEAR(NOW())
            del_flag = 0 and recharge_payment_status = 2  and YEAR(create_time) = YEAR(NOW())
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -496,7 +496,7 @@
        FROM
        t_charging_order
        <where>
            del_flag = 0 and recharge_payment_status = 2 and  ISNULL(refund_status)
            del_flag = 0 and recharge_payment_status = 2
            <if test="chargingOrderIds != null and chargingOrderIds.size() > 0">
                AND id IN
                <foreach collection="chargingOrderIds" item="chargingOrderId" open="(" separator="," close=")">
@@ -520,7 +520,6 @@
        WHERE
            del_flag = 0
          AND recharge_payment_status = 2
          AND ISNULL(refund_status)
          AND DATE(create_time) = CURDATE()
        <if test="siteIds != null and siteIds.size() > 0">
            AND site_id IN
@@ -542,7 +541,6 @@
        WHERE
            del_flag = 0
          AND recharge_payment_status = 2
          AND ISNULL(refund_status)
          AND DATE(create_time) = CURDATE() - INTERVAL 1 DAY
        <if test="siteIds != null and siteIds.size() > 0">
            AND site_id IN
@@ -570,7 +568,6 @@
        WHERE
            del_flag = 0
          AND recharge_payment_status = 2
          AND ISNULL(refund_status)
        <if test="siteIds != null and siteIds.size() > 0">
            AND site_id IN
            <foreach collection="siteIds" item="siteId" open="(" separator="," close=")">

 ruoyi-service/ruoyi-order/src/main/resources/mapper/order/TOrderInvoiceMapper.xml

@@ -62,7 +62,7 @@
                AND toi.name LIKE concat('%',#{query.name},'%')
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND toi.billing_time BETWEEN #{query.startTime} AND #{query.endTime}
                AND toi.create_time BETWEEN #{query.startTime} AND #{query.endTime}
            </if>
            <if test="query.userIds != null and query.userIds.size()>0">
                AND toi.billing_user_id IN

 ruoyi-service/ruoyi-payment/src/main/resources/bootstrap.yml

@@ -53,7 +53,7 @@
  config:
    type: nacos
    nacos:
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      data-id: seata-server.properties
@@ -63,7 +63,7 @@
    type: nacos
    nacos:
      application: seata-server
      server-addr: 127.0.0.1:8848
      server-addr: 192.168.110.169:8848
      namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb
      group: DEFAULT_GROUP
      username: nacos
@@ -71,7 +71,7 @@
  cloud:
    nacos:
      discovery:
        server-addr: 127.0.0.1:8848 # nacos注册中心地址
        server-addr: 192.168.110.169:8848
        namespace: b5290bc2-e3aa-4988-8a7d-9c07e4e073cb # 命名空间
        group: DEFAULT_GROUP
        application: seata-server #Nacos 中 Seata 名称