diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 0c4b5d1e4..ba63e138b 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -299,7 +299,7 @@ public class WxUserGrantController extends BaseController { updateCacheCUser(token, oldUser); // 登录后处理 - wxCUserService.actionAfterLogin(oldUser); + wxCUserService.actionMsgAfterLogin(oldUser); } else { // 新用户 @@ -339,7 +339,7 @@ public class WxUserGrantController extends BaseController { updateCacheCUser(token, newUser); // 登录后处理 - wxCUserService.actionAfterLogin(newUser); + wxCUserService.actionMsgAfterLogin(newUser); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java index cff4dc8f6..4f397fbe2 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/FmInsideCLoginMsg.java @@ -11,12 +11,15 @@ public class FmInsideCLoginMsg extends BaseMsg{ private static final long serialVersionUID = 1L; + @io.swagger.annotations.ApiModelProperty(value = "id", name = "id") + private Long id; + @io.swagger.annotations.ApiModelProperty(value = "租户ID", name = "tenantId") private String tenantId; @io.swagger.annotations.ApiModelProperty(value="父租户id",name="parentTenantId") private String parentTenantId; - @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "cUserId") - private Long cUserId; + @io.swagger.annotations.ApiModelProperty(value = "用户ID", name = "userId") + private Long userId; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java index 22735438e..b128b5f97 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserBasicInfoServiceImpl.java @@ -653,6 +653,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService,IExc List childrenList = record.getChildrenList(); if(childrenList != null && childrenList.size() > 0){ for (WxCUserBasicChild child:childrenList) { + child.setId(null); child.setCUserId(record.getId()); wxCUserBasicChildService.saveOrUpdate(child); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java index a2aef34a2..b2a67d993 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -255,9 +255,10 @@ public class WxCUserServiceImpl implements WxCUserService { @Override public void actionMsgAfterLogin(WxCUser user) { FmInsideCLoginMsg loginMsg = new FmInsideCLoginMsg(); + loginMsg.setId(user.getId()); loginMsg.setMsgType(EnumMsgRecordType.INSIDE_C_LOGIN.getCode()); loginMsg.updateTenantInfo(user); - loginMsg.setCUserId(user.getId()); + loginMsg.setUserId(user.getUserId()); mqBaseProducer.sendMessage(loginMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); } 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 ae79e2036..35e43364e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserTagsServiceImpl.java @@ -606,7 +606,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { return resList; } - private List assignTypeId21(WxCUserBasicInfo user,String tenantId) { + private List assignTypeId21(WxCUserBasicInfo user,TenantEntity tenantEntity) { List resList = null; Calendar startC = Calendar.getInstance(); startC.setTime(new Date()); @@ -616,7 +616,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { wxCouponOrder.setCUserId(user.getId()); wxCouponOrder.setStartTime(startC.getTime()); wxCouponOrder.setEndTime(new Date()); - wxCouponOrder.setTenantId(tenantId); + wxCouponOrder.updateTenantInfo(tenantEntity); int count = wxCouponOrderMapper.findCount(wxCouponOrder); @@ -715,27 +715,27 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { WxCUserBasicInfo param = (WxCUserBasicInfo) obj; WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getId(),param.getFinalTenantId()); if (user != null) { - if (param.getSex() != null) { + if (user.getSex() != null) { //性别 - resList = assignTypeId1(user, param.getSex()); + resList = assignTypeId1(user, user.getSex()); } - if (param.getBirthdate() != null) { + if (user.getBirthdate() != null) { //X0后 - resList = assignTypeId2(user, param.getBirthdate()); + resList = assignTypeId2(user, user.getBirthdate()); //生肖 - resList = assignTypeId3(user, param.getBirthdate()); + resList = assignTypeId3(user, user.getBirthdate()); //星座 - resList = assignTypeId4(user, param.getBirthdate()); + resList = assignTypeId4(user, user.getBirthdate()); } - if (param.getPhone() != null) { + if (user.getPhone() != null) { //来源 resList = assignTypeId5(user, false); //运营商 - resList = assignTypeId7(user, param.getPhone()); + resList = assignTypeId7(user, user.getPhone()); } - if (param.getEducation() != null) { + if (user.getEducation() != null) { //学历 - resList = assignTypeId6(user, param.getEducation()); + resList = assignTypeId6(user, user.getEducation()); } resList = assignTypeId29(user); } @@ -754,11 +754,11 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { WxCUser param = (WxCUser) obj; WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); if (user != null) { - if (param.getPhone() != null) { + if (user.getPhone() != null) { //来源 resList = assignTypeId5(user, true); //运营商 - resList = assignTypeId7(user, param.getPhone()); + resList = assignTypeId7(user, user.getPhone()); } } } @@ -782,24 +782,25 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { case ASSIGN_TAGS_TRIGGER_LOGIN: { WxCUser param = (WxCUser) obj; - WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); + WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectById(param.getUserId(),param.getFinalTenantId()); + if (user != null) { - if (param.getGender() != null) { + if (user.getSex() != null) { //性别 - resList = assignTypeId1(user, param.getGender()); + resList = assignTypeId1(user, user.getSex()); } if (param.getExtraInfo() != null) { //手机品牌 resList = assignTypeId9(user, param.getExtraInfo()); } - if (param.getPhone() != null) { + if (user.getPhone() != null) { //来源 resList = assignTypeId5(user, true); //运营商 - resList = assignTypeId7(user, param.getPhone()); + resList = assignTypeId7(user, user.getPhone()); } //活跃 - resList = assignTypeId21(user,param.getTenantId()); + resList = assignTypeId21(user,tenantEntity); } } break; @@ -843,7 +844,7 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { //消费频度 resList = assignTypeId22(user); //活跃 - resList = assignTypeId21(user,suser.getTenantId()); + resList = assignTypeId21(user,tenantEntity); //车 WxCUserCar wxCUserCar = new WxCUserCar(); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java index 53f1d06ca..74e717502 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideCLoginMsgServiceImpl.java @@ -35,10 +35,10 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception { FmInsideCLoginMsg msg = (FmInsideCLoginMsg)baseMsg; - WxCUser user = userService.getById(msg.getCUserId(),msg.getTenantId()); + WxCUser user = userService.getById(msg.getId(),msg.getTenantId()); if(user == null) { - logger.error("用户ID未找到: " + msg.getCUserId()); - throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + msg.getCUserId()); + logger.error("用户ID未找到: " + msg.getId()); + throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + msg.getId()); } userService.actionAfterLogin(user); }