diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
index 6aa1d16a2..5f109eaca 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java
@@ -22,10 +22,10 @@ public class AMapDiscountPriceChargingInfo {
     // 只填数字或数字区间，单位：元/度。
     // 空表示未获取到价格，0.00表示免费
     // 格式：保留四位小数
-    @JSONField(name = "DiscountTime")
+    @JSONField(name = "DiscountElectricityFee")
     private BigDecimal discountElectricityFee;
 
     // 站点服务费优惠价
-    @JSONField(name = "DiscountTime")
+    @JSONField(name = "DiscountServiceFee")
     private BigDecimal discountServiceFee;
 }
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 96cf400a2..47a822cf7 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
@@ -153,9 +153,9 @@ public class AMapServiceImpl implements AMapService {
         Map<String, List<AMapEquipmentInfo>> equipmentInfoMap = getPileListByStationIdList(stationIdList);
 
         // 拼装数据
-        List<AMapDiscountPriceChargingInfo> discountInfoList = new ArrayList<>();
-        List<AMapPictures> picturesList = new ArrayList<>();
-        AMapStationInfo aMapInfo = null;
+        List<AMapDiscountPriceChargingInfo> discountInfoList;
+        List<AMapPictures> picturesList;
+        AMapStationInfo aMapInfo;
         for (PileStationInfo stationInfo : stationList) {
             aMapInfo = new AMapStationInfo();
             String stationId = String.valueOf(stationInfo.getId());
@@ -191,6 +191,7 @@ public class AMapServiceImpl implements AMapService {
             aMapInfo.setEquipmentInfos(equipmentInfos);
             // 站点充电优惠价格(目前无优惠措施)
             AMapDiscountPriceChargingInfo info;
+            discountInfoList = Lists.newArrayList();
             for (AMapPriceChargingInfo aMapPriceChargingInfo : aMapPriceChargingInfos) {
                 info = new AMapDiscountPriceChargingInfo();
                 info.setDiscountTime(aMapPriceChargingInfo.getFeeTime());
@@ -201,18 +202,27 @@ public class AMapServiceImpl implements AMapService {
             }
             aMapInfo.setDiscountPriceChargingInfo(discountInfoList);
 
-            AMapPictures pictures = new AMapPictures();
-            if (StringUtils.isBlank(stationInfo.getPictures())) {
-                pictures.setPicID("");
-                pictures.setUrl("");
-                pictures.setTitle("");
-            }else {
-                pictures.setPicID("001");
-                pictures.setUrl(stationInfo.getPictures());
-                pictures.setTitle("1");
+            // 站点图片
+            picturesList = Lists.newArrayList();
+            AMapPictures aMapPictures;
+            String pictures = stationInfo.getPictures();
+            if (StringUtils.isNotBlank(pictures)) {
+                List<String> picList = Lists.newArrayList(pictures.split(","));
+                for (int i = 0; i < picList.size(); i++) {
+                    String s = picList.get(i);
+                    aMapPictures = new AMapPictures();
+                    aMapPictures.setUrl(s);
+                    aMapPictures.setTitle(Constants.ONE);
+                    aMapPictures.setPicID(String.valueOf(i + 1));
+                    picturesList.add(aMapPictures);
+                }
+            } else {
+                aMapPictures = new AMapPictures();
+                aMapPictures.setUrl("");
+                aMapPictures.setTitle("");
+                aMapPictures.setPicID("");
+                picturesList.add(aMapPictures);
             }
-            picturesList.add(pictures);
-
             aMapInfo.setPictures(picturesList);
 
             int fastTotal = 0;