diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java index bd5247b15..90635455b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxTagsType.java @@ -50,6 +50,18 @@ public class WxTagsType implements Serializable { @io.swagger.annotations.ApiModelProperty(value="1基础2生活属性3消费偏好4行为偏好",name="groupName") private String groupName; + /**名称**/ + @io.swagger.annotations.ApiModelProperty(value="标志",name="flag") + private Integer flag; + + public Integer getFlag() { + return flag; + } + + public void setFlag(Integer flag) { + this.flag = flag; + } + public Long getGroupId() { return groupId; } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java index c525be524..874b6b078 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java @@ -5,35 +5,32 @@ package com.iformall.enums; */ public enum EnumTagType { - ID_1(1L, true, EnumTagGroup.ID_1, "性别"), - ID_2(2L, true, EnumTagGroup.ID_1, "年龄"), - ID_3(3L, true, EnumTagGroup.ID_1, "生肖"), - ID_4(4L, true, EnumTagGroup.ID_1, "星座"), - ID_5(5L, true, EnumTagGroup.ID_1, "来源"), - ID_6(6L, true, EnumTagGroup.ID_1, "学历"), - ID_7(7L, true, EnumTagGroup.ID_1, "手机运营商"), - - ID_8(8L, true, EnumTagGroup.ID_2, "月收入"), - ID_9(9L, true, EnumTagGroup.ID_2, "手机品牌"), - ID_10(10L, true, EnumTagGroup.ID_2, "婚姻家庭"), - ID_11(11L, true, EnumTagGroup.ID_2, "车辆情况"), - ID_12(12L, true, EnumTagGroup.ID_2, "职业"), - ID_13(13L, true, EnumTagGroup.ID_2, "住房情况"), - - ID_14(14L, false, EnumTagGroup.ID_3, "消费类别"), - ID_15(15L, true, EnumTagGroup.ID_3, "消费档次"), - ID_16(16L, false, EnumTagGroup.ID_3, "品牌偏好"), - ID_17(17L, false, EnumTagGroup.ID_3, "饮食偏好"), - ID_18(18L, true, EnumTagGroup.ID_3, "消费时间段"), - ID_19(19L, false, EnumTagGroup.ID_3, "支付习惯"), - - ID_20(20L, true, EnumTagGroup.ID_4, "会员消费观"), - ID_21(21L, true, EnumTagGroup.ID_4, "消费频率"), - ID_22(22L, true, EnumTagGroup.ID_4, "活跃度"), - ID_23(23L, true, EnumTagGroup.ID_4, "客单价"), - ID_24(24L, true, EnumTagGroup.ID_4, "会员性格"), - ID_25(25L, false, EnumTagGroup.ID_4, "爱好"), - ID_26(26L, true, EnumTagGroup.ID_4, "生活半径"), + ID_1(1L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "性别"), + ID_2(2L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "年龄"), + ID_3(3L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "生肖"), + ID_4(4L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "星座"), + ID_5(5L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "来源"), + ID_6(6L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "学历"), + ID_7(7L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_1, "手机运营商"), + ID_8(8L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "月收入"), + ID_9(9L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "手机品牌"), + ID_10(10L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "婚姻家庭"), + ID_11(11L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "车辆情况"), + ID_12(12L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "职业"), + ID_13(13L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_2, "住房情况"), + ID_14(14L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "消费类别"), + ID_15(15L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_3, "消费档次"), + ID_16(16L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "品牌偏好"), + ID_17(17L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "饮食偏好"), + ID_18(18L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_3, "消费时间段"), + ID_19(19L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_3, "支付习惯"), + ID_20(20L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "会员消费观"), + ID_21(21L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "消费频率"), + ID_22(22L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "活跃度"), + ID_23(23L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "客单价"), + ID_24(24L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "会员性格"), + ID_25(25L, EnumTagTypeFlag.FLAG_NORMAL, EnumTagGroup.ID_4, "爱好"), + ID_26(26L, EnumTagTypeFlag.FLAG_SINGLE, EnumTagGroup.ID_4, "生活半径"), ; public static EnumTagType getEnum(Long code) { @@ -46,13 +43,14 @@ public enum EnumTagType { } private Long code; - private Boolean isSingle; + private EnumTagTypeFlag flag; private EnumTagGroup group; private String message; - EnumTagType(Long code, Boolean isSingle, EnumTagGroup group, String message) { + + EnumTagType(Long code, EnumTagTypeFlag flag, EnumTagGroup group, String message) { this.code = code; - this.isSingle = isSingle; + this.flag = flag; this.group = group; this.message = message; } @@ -62,8 +60,8 @@ public enum EnumTagType { return code; } - public Boolean isSingle() { - return isSingle; + public EnumTagTypeFlag getFlag() { + return flag; } public EnumTagGroup getGroup() { diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTagTypeFlag.java b/mallinkService/src/main/java/com/iformall/enums/EnumTagTypeFlag.java new file mode 100644 index 000000000..c7246d9b4 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTagTypeFlag.java @@ -0,0 +1,31 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumTagTypeFlag { + FLAG_NORMAL(0), + FLAG_SINGLE(1), + + ; + + public static EnumTagTypeFlag getEnum(Long code) { + for (EnumTagTypeFlag value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + + EnumTagTypeFlag(Integer code) { + this.code = code; + } + + public Integer getCode() { + return code; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java index d03ae8208..ff9d83b11 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -10,7 +10,7 @@ import com.iformall.domain.po.*; import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.enums.EnumCUserBaseInfoSex; import com.iformall.enums.EnumTag; -import com.iformall.enums.EnumTagType; +import com.iformall.enums.EnumTagTypeFlag; import com.iformall.mapper.*; import com.iformall.service.WxCUserBasicInfoService; import com.iformall.service.WxTagsService; @@ -152,7 +152,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { String tags = record.getTags(); List tagIdList = JSON.parseArray(tags, Long.class); - if (tag.getType().isSingle()){ + if (tag.getType().getFlag() == EnumTagTypeFlag.FLAG_SINGLE){ Iterator it = tagIdList.iterator(); while(it.hasNext()){ Long id = it.next(); diff --git a/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml index 0760afa58..8de9612bb 100644 --- a/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxTagsTypeMapper.xml @@ -6,10 +6,11 @@ + - `id`,`name`,`group_id`,`group_name` + `id`,`name`,`group_id`,`group_name`,`flag` @@ -31,6 +32,11 @@ and `group_name` = #{groupName} + + and `flag` = #{flag} + + + and id in