From 20e44bebcb7ede035e7a40b645c462b8e6e1ce28 Mon Sep 17 00:00:00 2001 From: hupeng Date: Mon, 15 Oct 2018 19:32:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=9A=E5=91=98=E4=BF=A1=E6=81=AF,?= =?UTF-8?q?=E6=89=93=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxCUserBasicInfoController.java | 2 ++ .../src/main/java/com/iformall/enums/EnumTagType.java | 2 +- .../java/com/iformall/service/impl/WxCUserTagsServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java index 7469d7923..31785807f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java @@ -7,6 +7,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.*; +import com.iformall.enums.EnumAssignTagsTrigger; import com.iformall.exception.MallinkException; import com.iformall.service.*; import io.swagger.annotations.Api; @@ -139,6 +140,7 @@ public class WxCUserBasicInfoController extends BaseController { wxCUserBasicInfo.setTagId(record.getId()); } wxCUserBasicInfoService.update(wxCUserBasicInfo); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT,wxCUserBasicInfo); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java b/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java index 874b6b078..190816e4a 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumTagType.java @@ -9,7 +9,7 @@ public enum EnumTagType { 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_5(5L, EnumTagTypeFlag.FLAG_NORMAL, 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, "月收入"), 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 ff2982c62..a784292f7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -355,7 +355,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { brand = brand.toUpperCase(); if (brand.equals("IPHONE")) resList = assign(user, EnumTag.ID_49); - else if (brand.equals("HUAWEI")) + else if (brand.equals("HUAWEI") || brand.equals("HONOR")) resList = assign(user, EnumTag.ID_50); else if (brand.equals("VIVO") || brand.toUpperCase().equals("OPPO")) resList = assign(user, EnumTag.ID_51);