diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 80132a362..e67fabd2d 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -206,7 +206,7 @@ public class BaseController { byId.setAvatarUrl(avatarUrl); byId.setSex(sex); wxCUserBasicInfoService.update(byId); - return null; + return byId.getId(); }else{ Date cur = new Date(); basicInfo = new WxCUserBasicInfo(); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java index ce14c1c9e..433562efa 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java @@ -88,7 +88,7 @@ public class WxMsgValidationcodeController extends BaseController { wxCUserService.saveOrUpdate(user); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE,user); - String key = Constant.tokenPrev + user.getOpenId(); + String key = Constant.tokenPrev + user.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 3424f868f..a0d02ca76 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -133,7 +133,7 @@ public class WxUserGrantController extends BaseController { * @return */ @AuthIgnore - @TenantIgnore + @TenantIgnore @PostMapping("/login") @ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") public ResultData userLogin(@RequestBody Map map) { @@ -218,7 +218,7 @@ public class WxUserGrantController extends BaseController { if (null != session) { logger.info("sessionResultDetail: [openid]" + session.getOpenid()+",[sessionkey]"+session.getSessionKey()+",[unionid]"+session.getUnionid()); } - + //获取会话密钥(session_key) session_key = session.getSessionKey(); openId = session.getOpenid(); @@ -428,7 +428,7 @@ public class WxUserGrantController extends BaseController { WxCUser user = getWxCUser(); if (StringUtils.isBlank(user.getScene()) || - user.getScene().equalsIgnoreCase(Constant.UNDEFINED)) { + user.getScene().equalsIgnoreCase(Constant.UNDEFINED)) { if(StringUtils.isNotBlank(scene) && scene.equalsIgnoreCase(Constant.UNDEFINED)) { user.setScene(scene); wxCUserService.updateScene(user); @@ -555,7 +555,7 @@ public class WxUserGrantController extends BaseController { user.setLanguage(userInfo.getLanguage()); wxCUserService.saveOrUpdate(updateUser); - String key = Constant.tokenPrev + user.getOpenId(); + String key = Constant.tokenPrev + user.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } @@ -641,7 +641,6 @@ public class WxUserGrantController extends BaseController { // user.setScore(memScore + score); // } } - wxCUserService.saveOrUpdate(user); if (!user.getPhone().contains("*")) { // 用户手机非加密 String phone = user.getPhone(); @@ -649,18 +648,14 @@ public class WxUserGrantController extends BaseController { phone = user.getVerifyCodePhone(); } // 更新到basicinfo - Long userId = user.getId(); - if(user.isBasicInfo()){ - userId = user.getUserId(); - } - Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), userId); + Long userBasicId = saveToBasicInfoByCUser(phone, user.getNickName(), user.getAvatarUrl(), user.getGender(), user.getUserId()); if (null != userBasicId) { user.setUserId(userBasicId); - wxCUserService.updateUserId(user); } + wxCUserService.saveOrUpdate(user); wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_PHONE, user); } - String key = Constant.tokenPrev + user.getOpenId(); + String key = Constant.tokenPrev + user.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java index 2ddf0e2a8..035863c93 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/TenantEntity.java @@ -33,19 +33,4 @@ public class TenantEntity extends BaseEntity { } } - public void updateFinalTenantInfo(TenantEntity info){ - if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); - }else{ - setTenantId(info.getTenantId()); - } - } - - public void updateFinalTenantInfo(BaseTenantEntity info){ - if (StringUtils.isNotBlank(info.getParentTenantId())) { - setParentTenantId(info.getParentTenantId()); - }else{ - setTenantId(info.getTenantId()); - } - } } 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 269118521..bf916d711 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCUserServiceImpl.java @@ -181,7 +181,7 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setScene(record.getScene()); userL.setUpdateDate(curr); int ret = wxCUserMapper.updateById(userL); - String key = Constant.tokenPrev + record.getOpenId(); + String key = Constant.tokenPrev + record.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } @@ -197,7 +197,7 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setLatitude(record.getLatitude()); userL.setUpdateDate(curr); int ret = wxCUserMapper.updateById(userL); - String key = Constant.tokenPrev + record.getOpenId(); + String key = Constant.tokenPrev + record.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } @@ -212,7 +212,7 @@ public class WxCUserServiceImpl implements WxCUserService { userL.setExtraInfo(record.getExtraInfo()); userL.setUpdateDate(curr); int ret = wxCUserMapper.updateById(userL); - String key = Constant.tokenPrev + record.getOpenId(); + String key = Constant.tokenPrev + record.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); } @@ -313,7 +313,7 @@ public class WxCUserServiceImpl implements WxCUserService { } } } - String key = Constant.tokenPrev + user.getOpenId(); + String key = Constant.tokenPrev + user.getToken(); if(baseCUserTokenRedisTemplate.hasKey(key)){ baseCUserTokenRedisTemplate.delete(key); }