From 1d1e3c49ebd29144b2f6ce8710523bae763b855b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 20 三月 2025 14:38:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java
index 63f2d13..ece801e 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java
@@ -1,5 +1,6 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -18,44 +19,52 @@
* 充电订单号
*/
@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;
/**
* 充电结束原因
* 0：用户手动停止充电
@@ -66,17 +75,32 @@
* 5·99：自定义
*/
@NotNull
- private Integer StopReason;
+ @JsonProperty("StopReason")
+ private Integer stopReason;
/**
* 时段数 N
* 0·32
*/
@Null
- private Integer SumPeriod;
+ @JsonProperty("SumPeriod")
+ private Integer sumPeriod;
/**
* 充电明细信息
*/
@Null
- private List<ChargeDetail> ChargeDetails;
+ @JsonProperty("ChargeDetails")
+ private List<ChargeDetail> chargeDetails;
+ /**
+ * 占位费
+ */
+ @Null
+ @JsonProperty("TotalDelayMoney")
+ private BigDecimal totalDelayMoney;
+ /**
+ * 车辆识别码
+ */
+ @Null
+ @JsonProperty("VIN")
+ private String VIN;
}
--
Gitblit v1.7.1