diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
index 77e876122..9fcee6cd4 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileStationInfo.java
@@ -81,7 +81,7 @@ public class PileStationInfo extends BaseEntity {
/**
* 停车费率描述
*/
- private String parkFreeDescribe;
+ private String parkFeeDescribe;
/**
* 充电站国家代码
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
index 92d052ee2..478676176 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileStationInfoServiceImpl.java
@@ -142,6 +142,9 @@ public class PileStationInfoServiceImpl implements IPileStationInfoService {
if (StringUtils.isNotBlank(pileStationInfo.getParkingNumber())) {
vo.setParkingNumber(pileStationInfo.getParkingNumber());
}
+ if (StringUtils.isNotBlank(pileStationInfo.getParkFeeDescribe())) {
+ vo.setParkFeeDescribe(pileStationInfo.getParkFeeDescribe());
+ }
vo.setMerchantAdminName(pileStationInfo.getStationAdminName());
vo.setStationStatus(Integer.parseInt(pileStationInfo.getStationStatus()));
vo.setStationType(pileStationInfo.getStationType());
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
index 5c5c8cb1a..db4772adc 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/PileStationVO.java
@@ -174,4 +174,9 @@ public class PileStationVO {
*/
private BigDecimal servicePrice;
+ /**
+ * 停车费率描述
+ */
+ private String parkFeeDescribe;
+
}
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
index f0cd4a53c..026886283 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileStationInfoMapper.xml
@@ -16,7 +16,7 @@
-
+
@@ -82,7 +82,7 @@
and capacity = #{capacity}
and public_parking = #{publicParking}
and parking_number = #{parkingNumber}
- and park_fee_describe = #{parkFreeDescribe}
+ and park_fee_describe = #{parkFeeDescribe}
and country_code = #{countryCode}
and area_code = #{areaCode}
and address like concat('%', #{address}, '%')
@@ -140,7 +140,7 @@
capacity,
public_parking,
parking_number,
- park_fee_describe,
+ park_fee_describe,
country_code,
area_code,
address,
@@ -194,7 +194,7 @@
#{capacity},
#{publicParking},
#{parkingNumber},
- #{parkFreeDescribe},
+ #{parkFeeDescribe},
#{countryCode},
#{areaCode},
#{address},
@@ -251,7 +251,7 @@
capacity = #{capacity},
public_parking = #{publicParking},
parking_number = #{parkingNumber},
- park_fee_describe = #{parkFreeDescribe},
+ park_fee_describe = #{parkFeeDescribe},
country_code = #{countryCode},
area_code = #{areaCode},
address = #{address},
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
index f9e7b424a..deac05bf0 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapStationInfo.java
@@ -85,6 +85,12 @@ public class AMapStationInfo {
@JsonProperty(value = "StationStatus")
private Integer stationStatus;
+ /**
+ * 停车费率描述
+ */
+ @JsonProperty(value = "ParkFee")
+ private String parkFee;
+
/**
* 营业状态
* 0:完全对外
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
index b6cc33d07..69ec75504 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java
@@ -163,6 +163,10 @@ public class AMapServiceImpl implements AMapService {
aMapInfo.setOperatorName(Constants.JSOWELL);
aMapInfo.setStationName(stationInfo.getStationName());
aMapInfo.setCountryCode(stationInfo.getCountryCode());
+ if (StringUtils.isNotBlank(stationInfo.getParkFeeDescribe())) {
+ // 停车费率描述
+ aMapInfo.setParkFee(stationInfo.getParkFeeDescribe());
+ }
aMapInfo.setAreaCode(stationInfo.getAreaCode());
aMapInfo.setServiceTel(stationInfo.getStationTel());
aMapInfo.setAddress(stationInfo.getAddress());
diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
index c47f94809..41afc5ff4 100644
--- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
+++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue
@@ -216,6 +216,14 @@
>
+
+
+
+
+