diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java index ddd88b343..42cc30092 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBillingTemplateServiceImpl.java @@ -630,7 +630,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic public BillingTemplateVO queryUsedBillingTemplateForEV(String stationId) { List list = queryStationBillingTemplateListForUniApp(stationId); Optional max = list.stream() - .filter(x -> StringUtils.equals(x.getDeviceType(), Constants.ONE)) // 过滤出汽车桩的计费模板 + .filter(x -> StringUtils.equals(x.getDeviceType(), Constants.ONE)) // 过滤出汽车桩的计费模板(1-电动汽车;2-电动自行车) + .filter(x -> StringUtils.equals(x.getStatus(), Constants.ONE)) // 状态为启用状态(0-未启用;1-启用) .filter(x -> StringUtils.isNotBlank(x.getPublishTime())) .filter(x -> StringUtils.equals(Constants.ZERO, x.getMemberFlag())) // 过滤出非会员价格 .max(Comparator.comparing(BillingTemplateVO::getPublishTime)); @@ -642,6 +643,7 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic List list = queryStationBillingTemplateListForUniApp(stationId); Optional max = list.stream() .filter(x -> StringUtils.equals(x.getDeviceType(), Constants.TWO)) // 过滤出电单车桩的计费模板 + .filter(x -> StringUtils.equals(x.getStatus(), Constants.ONE)) // 状态为启用状态(0-未启用;1-启用) .filter(x -> StringUtils.isNotBlank(x.getPublishTime())) .max(Comparator.comparing(BillingTemplateVO::getPublishTime)); return max.orElse(null);