mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-21 11:35:12 +08:00
查询正在使用中的计费模板方法, 添加过滤条件, 状态为1启用状态
This commit is contained in:
@@ -630,7 +630,8 @@ public class PileBillingTemplateServiceImpl implements PileBillingTemplateServic
|
||||
public BillingTemplateVO queryUsedBillingTemplateForEV(String stationId) {
|
||||
List<BillingTemplateVO> list = queryStationBillingTemplateListForUniApp(stationId);
|
||||
Optional<BillingTemplateVO> 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<BillingTemplateVO> list = queryStationBillingTemplateListForUniApp(stationId);
|
||||
Optional<BillingTemplateVO> 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);
|
||||
|
||||
Reference in New Issue
Block a user