From 93d9ab7399ee826698de4e808916dee026ebce90 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Wed, 14 Aug 2024 09:21:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B5=99=E6=B1=9F=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/StationInfo.java | 19 +++---- .../platform/domain/PolicyInfo.java | 55 +++++++++++++++++++ .../platform/domain/SupStationInfo.java | 4 ++ 3 files changed, 67 insertions(+), 11 deletions(-) create mode 100644 jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/PolicyInfo.java diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java index 30d917f22..cf05821e4 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/common/StationInfo.java @@ -212,13 +212,18 @@ public class StationInfo extends BaseStationInfo { private String serviceFee; /** - * 停车费 N - * 停车费率描述 - * <=100字符 + * 是否停车免费 0:否 1:是 */ @JSONField(name = "ParkFree") private Integer parkFree; + /** + * 停车费 N + * 停车费率描述 + */ + @JSONField(name = "ParkFee") + private String parkFee; + /** * 支付方式 N * 支付方式:刷卡、线上、现金 其中电子钱包类卡为刷卡,身份鉴权卡、微信/ 支付宝、APP为线上 @@ -304,14 +309,6 @@ public class StationInfo extends BaseStationInfo { @JSONField(name = "MinElectricityPrice") private BigDecimal minElectricityPrice; - - /** - * 停车费 N - * 停车费率描述 - */ - // private String ParkFee; - - /** * 停车收费类型 Y * 0:停车收费; diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/PolicyInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/PolicyInfo.java new file mode 100644 index 000000000..909bc1129 --- /dev/null +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/PolicyInfo.java @@ -0,0 +1,55 @@ +package com.jsowell.thirdparty.platform.domain; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Data; + +import java.math.BigDecimal; + +@Data +public class PolicyInfo { + /** + * 时段开始时间 + */ + @JsonProperty(value = "StartTime") + private String startTime; + + /** + * 时段开始时间 + */ + @JsonProperty(value = "EndTime") + private String endTime; + + /** + * 充电类型 + */ + @JsonProperty(value = "ChargingType") + private String chargingType; + + /** + * 电费 + * 保留小数点后四位 + */ + @JsonProperty(value = "ElecFee") + private BigDecimal elecFee; + + /** + * 服务费 + * 保留小数点后四位 + */ + @JsonProperty(value = "ServiceFee") + private BigDecimal serviceFee; + + /** + * 规则生效日期 + * 本计费规则生效日期,格式“yyyy-MM-dd” + */ + @JsonProperty(value = "StartDate") + private BigDecimal startDate; + + /** + * 规则失效日期 + * 本计费规则失效日期 ,格式“yyyy-MM-dd” + */ + @JsonProperty(value = "EndDate") + private BigDecimal endDate; +} diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java index db45eb714..64ac3da49 100644 --- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java +++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/domain/SupStationInfo.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import java.util.List; + /** * 内蒙古平台站点信息 */ @@ -29,4 +31,6 @@ public class SupStationInfo extends StationInfo { */ @JSONField(name = "AreaCodeCountryside") private String areaCodeCountryside; + + private List PolicyInfos; }