|
|
|
@@ -186,13 +186,16 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { |
|
|
|
}else{ |
|
|
|
tagIdList = JSON.parseArray(tags, Long.class); |
|
|
|
} |
|
|
|
logger.info("-----" + tagIdList.toString()); |
|
|
|
Iterator<Long> it = tagIdList.iterator(); |
|
|
|
while(it.hasNext()){ |
|
|
|
Long id = it.next(); |
|
|
|
if(null != id && null != EnumTag.getEnum(id) && EnumTag.getEnum(id).getCode() == type.getCode()){ |
|
|
|
it.remove(); |
|
|
|
logger.info("-----id remove" + id); |
|
|
|
} |
|
|
|
} |
|
|
|
logger.info("-----" + tagIdList.toString()); |
|
|
|
if(enumTags != null && enumTags.size() > 0){ |
|
|
|
for (EnumTag enumTag:enumTags) { |
|
|
|
tagIdList.add(enumTag.getCode()); |
|
|
|
@@ -653,10 +656,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { |
|
|
|
List<EnumTag> tags = new ArrayList<>(); |
|
|
|
for (WxCUserBasicChild child:list) { |
|
|
|
if(child.getBirthdate() != null){ |
|
|
|
logger.info("--------"+child.getBirthdate()); |
|
|
|
if (new Date().after(child.getBirthdate())) { |
|
|
|
int age = DateUtils.getAge(child.getBirthdate()); |
|
|
|
logger.info("--------"+age); |
|
|
|
if(age < 1){ |
|
|
|
if(!tags.contains(EnumTag.ID_166)){ |
|
|
|
tags.add(EnumTag.ID_166); |
|
|
|
|