From 4f52224f90165295047d75e3ad1dba1e6cf8e327 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 20 Oct 2018 16:11:49 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E6=89=93=E6=A0=87=E5=A2=9E=E5=8A=A0=E4=B8=80=E5=A4=84=E8=A7=A6?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxMsgValidationcodeController.java | 9 +++++---- .../iformall/service/impl/WxCUserTagsServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index 5bac5e2a5..e61ab86cb 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -4,10 +4,8 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxMsgValidationcode; -import com.iformall.service.WxCUserService; -import com.iformall.service.WxMerchantBUserService; -import com.iformall.service.WxMerchantService; -import com.iformall.service.WxMsgValidationcodeService; +import com.iformall.enums.EnumAssignTagsTrigger; +import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -38,6 +36,8 @@ public class WxMsgValidationcodeController extends BaseController { @Autowired private WxCUserService wxCUserService; + @Autowired + private WxCUserTagsService wxCUserTagsService; @GetMapping("sendvalidationcode") @ApiImplicitParams({ @@ -75,6 +75,7 @@ public class WxMsgValidationcodeController extends BaseController { // 更新到basicinfo saveToBasicInfo(user); + wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user); } return rd; } 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 108138f6d..579323ec9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -172,7 +172,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { } else { while(it.hasNext()){ Long id = it.next(); - if(EnumTag.getEnum(id) == tag){ + if(id.equals(tag.getCode())){ it.remove(); } }