From 87dcd22d5b1b1eb951cc4abdd8b64e733928ca00 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 四月 2025 11:38:16 +0800
Subject: [PATCH] 修改查询报表bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/model/OrderInfo.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/model/OrderInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/model/OrderInfo.java
index fa1630a..1a8763a 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/model/OrderInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/kuaidian/model/OrderInfo.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.kuaidian.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
import com.ruoyi.integration.drainage.model.ChargeDetail;
import lombok.Data;
@@ -19,48 +20,57 @@
* 充电订单号
*/
@NotNull
- private String StartChargeSeq;
+ @JsonProperty("StartChargeSeq")
+ private String startChargeSeq;
/**
* 充电设备接口编码
*/
@NotNull
- private String ConnectorID;
+ @JsonProperty("ConnectorID")
+ private String connectorID;
/**
* 开始充电时间
* yyyy-MM-dd HH:mm:ss
*/
@NotNull
- private String StartTime;
+ @JsonProperty("StartTime")
+ private String startTime;
/**
* 结束充电时间
* yyyy-MM-dd HH:mm:ss
*/
@NotNull
- private String EndTime;
+ @JsonProperty("EndTime")
+ private String endTime;
/**
* 累计充电电量
*/
@NotNull
- private BigDecimal TotalPower;
+ @JsonProperty("TotalPower")
+ private BigDecimal totalPower;
/**
* 总电费
*/
@NotNull
- private BigDecimal TotalElecMoney;
+ @JsonProperty("TotalElecMoney")
+ private BigDecimal totalElecMoney;
/**
* 总服务费
*/
@NotNull
- private BigDecimal TotalSeviceMoney;
+ @JsonProperty("TotalSeviceMoney")
+ private BigDecimal totalSeviceMoney;
/**
* 累计总金额
*/
@NotNull
- private BigDecimal TotalMoney;
+ @JsonProperty("TotalMoney")
+ private BigDecimal totalMoney;
/**
* 车辆识别码
*/
@Null
+ @JsonProperty("VIN")
private String VIN;
/**
* 充电结束原因
@@ -72,15 +82,18 @@
* 5`99：自定义
*/
@NotNull
- private Integer StopReason;
+ @JsonProperty("StopReason")
+ private Integer stopReason;
/**
* 时段数N
* 范围0`23
*/
@Null
- private Integer SumPeriod;
+ @JsonProperty("SumPeriod")
+ private Integer sumPeriod;
/**
* 充电明细信息
*/
- private List<ChargeDetail> ChargeDetails;
+ @JsonProperty("ChargeDetails")
+ private List<ChargeDetail> chargeDetails;
}
--
Gitblit v1.7.1