|
|
|
@@ -62,8 +62,8 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public WxCUser getById(Long id) { |
|
|
|
return wxCUserMapper.selectById(id); |
|
|
|
public WxCUser getById(Long id,String tenantId) { |
|
|
|
return wxCUserMapper.selectById(id,tenantId); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@@ -215,10 +215,10 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
return ret; |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void deleteById(Long id) { |
|
|
|
wxCUserMapper.deleteById(id); |
|
|
|
} |
|
|
|
// @Override |
|
|
|
// public void deleteById(Long id,String tenantId) { |
|
|
|
// wxCUserMapper.deleteById(id,tenantId); |
|
|
|
// } |
|
|
|
|
|
|
|
@Override |
|
|
|
public long findCount(WxCUserBasicInfoDto dto) { |
|
|
|
@@ -288,7 +288,7 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
basicInfo.setLoginCount(loingcount+1); |
|
|
|
wxCUserBasicInfoService.update(basicInfo); |
|
|
|
} |
|
|
|
WxCUser wxCUser = getById(user.getId()); |
|
|
|
WxCUser wxCUser = getById(user.getId(),user.getTenantId()); |
|
|
|
if (wxCUser != null) { |
|
|
|
WxCUser cUser = new WxCUser(); |
|
|
|
cUser.setId(user.getId()); |
|
|
|
@@ -298,22 +298,22 @@ public class WxCUserServiceImpl implements WxCUserService { |
|
|
|
wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_LOGIN, wxCUser); |
|
|
|
} |
|
|
|
// 用户从unionId来的,可能会有重复 |
|
|
|
if(findByUnionId != null) { |
|
|
|
if(findByUnionId) { |
|
|
|
WxCUser userQ = new WxCUser(); |
|
|
|
userQ.setOpenAppId(user.getAppId()); |
|
|
|
userQ.setOpenId(user.getOpenId()); |
|
|
|
List<WxCUser> userList = wxCUserMapper.findList(userQ); |
|
|
|
if(userList.size() > 1) { |
|
|
|
for(WxCUser tempUser: userList) { |
|
|
|
if(tempUser.getUnionId() == null) { |
|
|
|
// 删除 无unionId的用户 |
|
|
|
wxCUserMapper.deleteById(tempUser.getId()); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
// if(findByUnionId != null) { |
|
|
|
// if(findByUnionId) { |
|
|
|
// WxCUser userQ = new WxCUser(); |
|
|
|
// userQ.setOpenAppId(user.getAppId()); |
|
|
|
// userQ.setOpenId(user.getOpenId()); |
|
|
|
// List<WxCUser> userList = wxCUserMapper.findList(userQ); |
|
|
|
// if(userList.size() > 1) { |
|
|
|
// for(WxCUser tempUser: userList) { |
|
|
|
// if(tempUser.getUnionId() == null) { |
|
|
|
// // 删除 无unionId的用户 |
|
|
|
// wxCUserMapper.deleteById(tempUser.getId()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } |
|
|
|
// } |
|
|
|
String key = Constant.tokenPrev + user.getToken(); |
|
|
|
if(baseCUserTokenRedisTemplate.hasKey(key)){ |
|
|
|
baseCUserTokenRedisTemplate.delete(key); |
|
|
|
|