Commit 2fad27ef by huluobin

update

parent 2a0e10f5
...@@ -923,9 +923,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -923,9 +923,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
}) })
.filter(leisureScheduleServeResp -> ListUtil.isNotEmpty(leisureScheduleServeResp.getStoreTechnicianList())) .filter(leisureScheduleServeResp -> ListUtil.isNotEmpty(leisureScheduleServeResp.getStoreTechnicianList()))
.filter(leisureScheduleServeResp -> { .filter(leisureScheduleServeResp -> {
List<Integer> discountConfigLabelIds = leisureScheduleServeResp.getLeisureDiscountConfigLabelList().stream().map(LeisureDiscountConfigLabel::getLabelId).collect(Collectors.toList()); if (ListUtil.isEmpty(leisureScheduleServeResp.getLeisureDiscountConfigLabelList())) {
discountConfigLabelIds.retainAll(customerLabelIds); return true;
return ListUtil.isNotEmpty(discountConfigLabelIds); } else {
List<Integer> discountConfigLabelIds = leisureScheduleServeResp.getLeisureDiscountConfigLabelList().stream().map(LeisureDiscountConfigLabel::getLabelId).collect(Collectors.toList());
discountConfigLabelIds.retainAll(customerLabelIds);
return ListUtil.isNotEmpty(discountConfigLabelIds);
}
}) })
.collect(Collectors.toList()); .collect(Collectors.toList());
page.setRecords(list); page.setRecords(list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment