|
@@ -41,20 +41,23 @@ public class AppUserInfoController {
|
|
ResultData resultData=null;
|
|
ResultData resultData=null;
|
|
try{
|
|
try{
|
|
AppUserInfo appUserInfo =new AppUserInfo();
|
|
AppUserInfo appUserInfo =new AppUserInfo();
|
|
- String openId = ""; //此参数用于查询该用户是否已注册过
|
|
|
|
|
|
+ //String openId = ""; //此参数用于查询该用户是否已注册过
|
|
|
|
+ String token =""; //用户token
|
|
if(request.getUserType()!=null){
|
|
if(request.getUserType()!=null){
|
|
//1-微信公众号
|
|
//1-微信公众号
|
|
if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getBlogOpenid())&&StringUtils.isNotBlank(request.getBlogToken())){
|
|
if(request.getUserType().equals("1") &&StringUtils.isNotBlank(request.getBlogOpenid())&&StringUtils.isNotBlank(request.getBlogToken())){
|
|
appUserInfo.setUserType(request.getUserType());
|
|
appUserInfo.setUserType(request.getUserType());
|
|
- appUserInfo.setBlogToken(request.getBlogToken());
|
|
|
|
- openId = request.getBlogOpenid();
|
|
|
|
- appUserInfo.setBlogOpenid(openId);
|
|
|
|
|
|
+ token = request.getBlogToken();
|
|
|
|
+ appUserInfo.setBlogToken(token);
|
|
|
|
+ //openId = request.getBlogOpenid();
|
|
|
|
+ appUserInfo.setBlogOpenid(request.getBlogOpenid());
|
|
//2-微信小程序
|
|
//2-微信小程序
|
|
}else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())&&StringUtils.isNotBlank(request.getMinaToken())){
|
|
}else if(request.getUserType().equals("2") &&StringUtils.isNotBlank(request.getMinaOpenid())&&StringUtils.isNotBlank(request.getMinaToken())){
|
|
appUserInfo.setUserType(request.getUserType());
|
|
appUserInfo.setUserType(request.getUserType());
|
|
- appUserInfo.setMinaToken(request.getMinaToken());
|
|
|
|
- openId = request.getMinaOpenid();
|
|
|
|
- appUserInfo.setMinaOpenid(openId);
|
|
|
|
|
|
+ token = request.getMinaToken();
|
|
|
|
+ appUserInfo.setMinaToken(token);
|
|
|
|
+ //openId = request.getMinaOpenid();
|
|
|
|
+ appUserInfo.setMinaOpenid(request.getMinaOpenid());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(StringUtils.isNotBlank(request.getBlogNickName())){
|
|
if(StringUtils.isNotBlank(request.getBlogNickName())){
|
|
@@ -75,7 +78,8 @@ public class AppUserInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
Map<String, Object> params = new HashMap<>();
|
|
Map<String, Object> params = new HashMap<>();
|
|
- params.put("openId", openId); //注册用户openId
|
|
|
|
|
|
+ //params.put("openId", openId); //注册用户openId
|
|
|
|
+ params.put("token", token); //用户登录凭证
|
|
params.put("userType", request.getUserType()); //用户类型
|
|
params.put("userType", request.getUserType()); //用户类型
|
|
//判断该用户是否已存在
|
|
//判断该用户是否已存在
|
|
int count = appUserInfoService.isExistAppUser(params);
|
|
int count = appUserInfoService.isExistAppUser(params);
|