diff --git a/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java b/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java index c00f950f1..8665a2a81 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java +++ b/jsowell-common/src/main/java/com/jsowell/common/enums/parkplatform/ParkingPlatformEnum.java @@ -35,4 +35,18 @@ public enum ParkingPlatformEnum { public void setLabel(String label) { this.label = label; } + + /** + * 根据code获取label + * @param code + * @return + */ + public static String getByCode(String code) { + for (ParkingPlatformEnum value : ParkingPlatformEnum.values()) { + if (value.getCode().equals(code)) { + return value.getLabel(); + } + } + return null; + } } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java index e1ceb0616..0dd703f14 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/CarCouponRecordServiceImpl.java @@ -2,6 +2,7 @@ package com.jsowell.pile.service.impl; import com.jsowell.common.constant.CacheConstants; import com.jsowell.common.core.redis.RedisCache; +import com.jsowell.common.enums.parkplatform.ParkingPlatformEnum; import com.jsowell.common.util.DateUtils; import com.jsowell.pile.domain.CarCouponRecord; import com.jsowell.pile.dto.ParkingCouponRecordQueryDTO; @@ -11,7 +12,9 @@ import com.jsowell.pile.vo.uniapp.customer.ParkingOrderVO; import com.jsowell.pile.vo.web.ParkingCouponRecordVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -123,7 +126,9 @@ public class CarCouponRecordServiceImpl implements CarCouponRecordService { @Override public List selectParkingCouponRecordList(ParkingCouponRecordQueryDTO queryDTO) { List list = carCouponRecordMapper.selectParkingCouponRecordList(queryDTO); - + if (CollectionUtils.isEmpty(list)) { + return new ArrayList<>(); + } // 循环list,将各参数值换成汉字 for (ParkingCouponRecordVO parkingCouponRecordVO : list) { String conditionType = parkingCouponRecordVO.getConditionType(); @@ -138,6 +143,9 @@ public class CarCouponRecordServiceImpl implements CarCouponRecordService { } else if ("2".equals(discountType)) { parkingCouponRecordVO.setDiscountType("减免停车金额(单位:元)"); } + String parkingPlatformId = parkingCouponRecordVO.getParkingPlatformId(); + String label = ParkingPlatformEnum.getByCode(parkingPlatformId); + parkingCouponRecordVO.setParkingPlatformName(label); } return list; } diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java index 55d6f206f..c7e5c40af 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/web/ParkingCouponRecordVO.java @@ -46,7 +46,10 @@ public class ParkingCouponRecordVO { private String returnMsg; @ApiModelProperty("停车平台ID") - private Integer parkingPlatformId; + private String parkingPlatformId; + + @ApiModelProperty("停车平台名称") + private String parkingPlatformName; @ApiModelProperty("条件类型(1-固定电量;2-固定时长)") private String conditionType;