|
|
|
@@ -224,6 +224,46 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
private final static List<WxTags> memberLoginActivity = new ArrayList<WxTags>( |
|
|
|
Arrays.asList( |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_53.getCode()); |
|
|
|
setName(EnumTag.ID_1200.getMessage()); |
|
|
|
setId(EnumTag.ID_1200.getCode()); |
|
|
|
}}, |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_53.getCode()); |
|
|
|
setName(EnumTag.ID_1201.getMessage()); |
|
|
|
setId(EnumTag.ID_1201.getCode()); |
|
|
|
}}, |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_53.getCode()); |
|
|
|
setName(EnumTag.ID_1202.getMessage()); |
|
|
|
setId(EnumTag.ID_1202.getCode()); |
|
|
|
}} |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
private final static List<WxTags> memberCouponVerified = new ArrayList<WxTags>( |
|
|
|
Arrays.asList( |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_54.getCode()); |
|
|
|
setName(EnumTag.ID_1300.getMessage()); |
|
|
|
setId(EnumTag.ID_1300.getCode()); |
|
|
|
}}, |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_54.getCode()); |
|
|
|
setName(EnumTag.ID_1301.getMessage()); |
|
|
|
setId(EnumTag.ID_1301.getCode()); |
|
|
|
}}, |
|
|
|
new WxTags(){{ |
|
|
|
setTypeId(EnumTagType.ID_54.getCode()); |
|
|
|
setName(EnumTag.ID_1302.getMessage()); |
|
|
|
setId(EnumTag.ID_1302.getCode()); |
|
|
|
}} |
|
|
|
) |
|
|
|
); |
|
|
|
|
|
|
|
private void filtersToDtoID0(WxCUserBasicInfoDto dto, WxCUserBasicInfoFilterDto f) { |
|
|
|
dto.setPhones(f.getParam()); |
|
|
|
} |
|
|
|
@@ -294,6 +334,61 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
localDate.plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void filtersToDtoID53(WxCUserBasicInfoDto dto, WxCUserBasicInfoFilterDto f) { |
|
|
|
LocalDate localDate = LocalDate.now(); |
|
|
|
ZoneId zone = ZoneId.systemDefault(); |
|
|
|
if (f.getId().equals(EnumTag.ID_1200.getCode())) { |
|
|
|
dto.setLoginStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setLoginEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusDays(1).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} else if (f.getId().equals(EnumTag.ID_1201.getCode())){ |
|
|
|
dto.setLoginStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.with(DayOfWeek.MONDAY).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setLoginEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusWeeks(1).with(DayOfWeek.MONDAY).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} else if (f.getId().equals(EnumTag.ID_1202.getCode())){ |
|
|
|
dto.setLoginStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setLoginEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void filtersToDtoID54(WxCUserBasicInfoDto dto, WxCUserBasicInfoFilterDto f) { |
|
|
|
LocalDate localDate = LocalDate.now(); |
|
|
|
ZoneId zone = ZoneId.systemDefault(); |
|
|
|
if (f.getId().equals(EnumTag.ID_1300.getCode())) { |
|
|
|
dto.setVerifiedStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setVerifiedEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusDays(1).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} else if (f.getId().equals(EnumTag.ID_1301.getCode())){ |
|
|
|
dto.setVerifiedStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.with(DayOfWeek.MONDAY).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setVerifiedEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusWeeks(1).with(DayOfWeek.MONDAY).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} else if (f.getId().equals(EnumTag.ID_1302.getCode())){ |
|
|
|
dto.setVerifiedStartTime( |
|
|
|
Date.from( |
|
|
|
localDate.with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
dto.setVerifiedEndTime( |
|
|
|
Date.from( |
|
|
|
localDate.plusMonths(1).with(TemporalAdjusters.firstDayOfMonth()).atStartOfDay().atZone(zone).toInstant())); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private WxCUserBasicInfoDto filtersToDto(String tenantId, List<WxCUserBasicInfoFilterDto> filterList){ |
|
|
|
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto(); |
|
|
|
List<Long> tagIdList = new ArrayList<>(); |
|
|
|
@@ -311,6 +406,10 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
filtersToDtoID51(dto,f); |
|
|
|
} else if (f.getTypeId().equals(EnumTagType.ID_52.getCode())) { |
|
|
|
filtersToDtoID52(dto,f); |
|
|
|
} else if (f.getTypeId().equals(EnumTagType.ID_53.getCode())) { |
|
|
|
filtersToDtoID53(dto,f); |
|
|
|
} else if (f.getTypeId().equals(EnumTagType.ID_54.getCode())) { |
|
|
|
filtersToDtoID54(dto,f); |
|
|
|
} else { |
|
|
|
tagIdList.add(f.getId()); |
|
|
|
} |
|
|
|
@@ -365,6 +464,24 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
return type; |
|
|
|
} |
|
|
|
|
|
|
|
private WxTagsTypeVo generateType53() { |
|
|
|
WxTagsTypeVo type = new WxTagsTypeVo(); |
|
|
|
type.setFlag(EnumTagTypeFlag.FLAG_SINGLE.getCode()); |
|
|
|
type.setName(EnumTagType.ID_53.getMessage()); |
|
|
|
type.setId(EnumTagType.ID_53.getCode()); |
|
|
|
type.setTags(memberLoginActivity); |
|
|
|
return type; |
|
|
|
} |
|
|
|
|
|
|
|
private WxTagsTypeVo generateType54() { |
|
|
|
WxTagsTypeVo type = new WxTagsTypeVo(); |
|
|
|
type.setFlag(EnumTagTypeFlag.FLAG_SINGLE.getCode()); |
|
|
|
type.setName(EnumTagType.ID_54.getMessage()); |
|
|
|
type.setId(EnumTagType.ID_54.getCode()); |
|
|
|
type.setTags(memberCouponVerified); |
|
|
|
return type; |
|
|
|
} |
|
|
|
|
|
|
|
public List<WxTagsGroupVo> listFilters(String tenantId) { |
|
|
|
WxTagsGroupVo filter = new WxTagsGroupVo(); |
|
|
|
|
|
|
|
@@ -375,7 +492,8 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
types.add(generateType50()); |
|
|
|
types.add(generateType51(tenantId)); |
|
|
|
types.add(generateType52()); |
|
|
|
|
|
|
|
types.add(generateType53()); |
|
|
|
types.add(generateType54()); |
|
|
|
filter.setTypes(types); |
|
|
|
List<WxTagsGroupVo> listVo =wxTagsService.listAllVo(); |
|
|
|
listVo.add(0,filter); |
|
|
|
@@ -399,8 +517,6 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/***************user filter end******************************************/ |
|
|
|
|
|
|
|
@Override |
|
|
|
|