From ee851dc27d2704738a8d7fab17447a0dbf2da53f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 16 Oct 2020 10:57:37 +0800 Subject: [PATCH] =?UTF-8?q?wx=5Fc=5Fuser=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/mem/WxCUserController.java | 20 ++++---- .../com/iformall/mapper/WxCUserMapper.java | 2 + .../com/iformall/service/WxCUserService.java | 4 +- .../service/impl/WxCUserServiceImpl.java | 46 +++++++++---------- .../impl/FmInsideCLoginMsgServiceImpl.java | 2 +- .../main/resources/mapper/WxCUserMapper.xml | 6 ++- 6 files changed, 43 insertions(+), 37 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java index d3f15c979..92bb50b21 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java @@ -58,15 +58,15 @@ public class WxCUserController extends BaseController { return new ResultData(); } - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) - @SystemControllerLog(description = "用户管理-删除") - public ResultData delete(Long id) { - logger.debug("[" + getIpAddr() + "] WxCUserController::delete"); - wxCUserService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } +// @ApiOperation("根据id删除接口") +// @GetMapping("/del") +// @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) +// @SystemControllerLog(description = "用户管理-删除") +// public ResultData delete(Long id) { +// logger.debug("[" + getIpAddr() + "] WxCUserController::delete"); +// wxCUserService.deleteById(id); +// return new ResultData(Result.SUCCESS, "删除成功", null); +// } @ApiOperation("根据id查询接口") @GetMapping("/findById") @@ -74,7 +74,7 @@ public class WxCUserController extends BaseController { @SystemControllerLog(description = "用户管理-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCUserController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCUserService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCUserService.getById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java index 3327ff864..e36fa490b 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCUserMapper.java @@ -20,6 +20,8 @@ public interface WxCUserMapper extends CommonMapper { WxCUser findByToken(@Param("token")String token,@Param("tenantId")String tenantId); + WxCUser selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + long findCount(WxCUserBasicInfoDto dto); List findCountHistory(WxCUserBasicInfoDto dto); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java index 24d99ad84..05a821def 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCUserService.java @@ -30,7 +30,7 @@ public interface WxCUserService { * @param id * @return */ - WxCUser getById(Long id); + WxCUser getById(Long id,String tenantId); /** * 根据openId获得实体 @@ -89,7 +89,7 @@ public interface WxCUserService { * * @param id */ - void deleteById(Long id); + //void deleteById(Long id,String tenantId); /** * 统计数量 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 33f393d6c..18cc1c12a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -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 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 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); 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 0fa7610c1..44e39f740 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,7 +35,7 @@ public class FmInsideCLoginMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception { FmInsideCLoginMsg msg = (FmInsideCLoginMsg)baseMsg; - WxCUser user = userService.getById(msg.getCUserId()); + WxCUser user = userService.getById(msg.getCUserId(),msg.getTenantId()); if(user == null) { logger.error("用户ID未找到: " + msg.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户ID未找到" + msg.getCUserId()); diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index f00ecd981..bc4f17b0d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -240,10 +240,14 @@ where `open_app_id` = #{openAppId} and `union_id` = #{unionId} - select from wx_c_user where `token` = #{token} and `tenant_id` = #{tenantId} + +