From fb9e286342938f63af535eb2a363f783a63213db Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 28 五月 2025 11:13:57 +0800 Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev --- ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/NotificationChargeOrderInfo.java | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 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 78f4c62..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,43 +19,51 @@ * 充电订单号 */ @NotNull + @JsonProperty("StartChargeSeq") private String startChargeSeq; /** * 充电设备接口编码 */ @NotNull + @JsonProperty("ConnectorID") private String connectorID; /** * 开始充电时间 * yyyy-MM-dd HH:mm:ss */ @NotNull + @JsonProperty("StartTime") private String startTime; /** * 结束充电时间 * yyyy-MM-dd HH:mm:ss */ @NotNull + @JsonProperty("EndTime") private String endTime; /** * 累计充电量 */ @NotNull + @JsonProperty("TotalPower") private BigDecimal totalPower; /** * 总电费 */ @NotNull + @JsonProperty("TotalElecMoney") private BigDecimal totalElecMoney; /** * 总服务费 */ @NotNull + @JsonProperty("TotalSeviceMoney") private BigDecimal totalSeviceMoney; /** * 累计总金额 */ @NotNull + @JsonProperty("TotalMoney") private BigDecimal totalMoney; /** * 充电结束原因 @@ -66,27 +75,32 @@ * 5·99:自定义 */ @NotNull + @JsonProperty("StopReason") private Integer stopReason; /** * 时段数 N * 0·32 */ @Null + @JsonProperty("SumPeriod") private Integer sumPeriod; /** * 充电明细信息 */ @Null + @JsonProperty("ChargeDetails") private List<ChargeDetail> chargeDetails; /** * 占位费 */ @Null + @JsonProperty("TotalDelayMoney") private BigDecimal totalDelayMoney; /** * 车辆识别码 */ @Null + @JsonProperty("VIN") private String VIN; } -- Gitblit v1.7.1