diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 6749e78b4..f07d349af 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -181,6 +181,9 @@ public class BaseController { WxCUserBasicInfo basicInfo = wxCUserBasicInfoService.findInfoByPhone(tenantEntity, userPhone); if (basicInfo != null) { + if(byId != null && !byId.getPhone().equals(basicInfo.getPhone())){ + return Long.valueOf(-1); + } // WxCUserBasicInfo basicInfo = list.get(0); // 微信名称,统一成微信昵称 // if (!Objects.equals(basicInfo.getNickName(), user.getNickName())) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index a301f36c0..3aca31984 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -80,6 +80,9 @@ public class WxMsgValidationcodeController extends BaseController { } Long basicUserId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); if (null != basicUserId) { + if(basicUserId.intValue() == -1){ + return rd; + } user.setUserId(basicUserId); } // 更新 WxCUser diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 148e50235..6ff1a1e51 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -660,6 +660,9 @@ public class WxUserGrantController extends BaseController { // 更新到basicinfo Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); if (null != userBasicId) { + if(userBasicId.intValue() == -1){ + return new ResultData(ErrorCode.USER_PHONE_IS_FOUND); + } user.setUserId(userBasicId); } wxCUserService.saveOrUpdate(user); diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index e9d8f435a..75fd3bbb0 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -17,7 +17,7 @@ - +