autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 11:05:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-06-27 16:41:12 +08:00
parent 27098b7a6d
commit ef4d5aa6a3
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/domain/AMapDiscountPriceChargingInfo.java vendored
View File

@@ -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;
}

38
jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java vendored
View File

@@ -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;