Commit 24bda6f4 authored by renandong's avatar renandong 🇨🇳

1,查询用户缴费记录,电费.话费合并后去重

parent 1791abf9
...@@ -88,14 +88,14 @@ public class UserTagsTask { ...@@ -88,14 +88,14 @@ public class UserTagsTask {
return; return;
} }
//查询老用户 //查询老用户
List<String> list = pushLogService.getOrderUidList().stream().filter(org.apache.commons.lang3.StringUtils::isNumeric).collect(Collectors.toList()); List<String> list = pushLogService.getOrderUidList().stream().filter(org.apache.commons.lang3.StringUtils::isNumeric).distinct().collect(Collectors.toList());
if (!CollectionUtils.isEmpty(list)) { if (!CollectionUtils.isEmpty(list)) {
//将推送配置json转为推送实体类 //将推送配置json转为推送实体类
InformForm form = JSONObject.parseObject(configContent, InformForm.class); InformForm form = JSONObject.parseObject(configContent, InformForm.class);
//当天是否为15号 //当天是否为15号
if (DateUtils.isToday(15)) { if (DateUtils.isToday(15)) {
//查询14天前至今有缴费记录用户 //查询14天前至今有缴费记录用户
List<String> record = pushLogService.getPayCostRecord().stream().filter(org.apache.commons.lang3.StringUtils::isNumeric).collect(Collectors.toList()); List<String> record = pushLogService.getPayCostRecord().stream().filter(org.apache.commons.lang3.StringUtils::isNumeric).distinct().collect(Collectors.toList());
//过滤已缴费用户 //过滤已缴费用户
if (!CollectionUtils.isEmpty(record)) { if (!CollectionUtils.isEmpty(record)) {
list.removeAll(record); list.removeAll(record);
......
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