|
|
|
@ -37,15 +37,13 @@ public class MiniAppService {
|
|
|
|
|
WxMaUserInfo userInfo = wxService.getUserService().getUserInfo(sessionKey, encryptedData, iv);
|
|
|
|
|
//todo 数据库insert or update
|
|
|
|
|
String openId = userInfo.getOpenId();
|
|
|
|
|
// Example userExample = new Example(MiniUser.class);
|
|
|
|
|
// Example.Criteria userExampleCriteria = userExample.createCriteria();
|
|
|
|
|
// userExampleCriteria.andEqualTo("openId",openId);
|
|
|
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
|
|
|
columnMap.put("open_id", openId);
|
|
|
|
|
List<MiniUser> miniUsers = miniUserMapper.selectByMap(columnMap);
|
|
|
|
|
MiniUser miniUser = miniUsers.get(0);
|
|
|
|
|
miniUser.setSex(userInfo.getGender());
|
|
|
|
|
miniUser.setHeadImg(userInfo.getAvatarUrl());
|
|
|
|
|
miniUser.setArea(userInfo.getCity());
|
|
|
|
|
miniUserMapper.updateById(miniUser);
|
|
|
|
|
// oceanUser.setNickName(userInfo.getNickName());
|
|
|
|
|
// oceanUser.setSex(userInfo.getGender());
|
|
|
|
@ -82,16 +80,10 @@ public class MiniAppService {
|
|
|
|
|
String openid = sessionInfo.getOpenid();
|
|
|
|
|
String unionid = sessionInfo.getUnionid();
|
|
|
|
|
//todo 根据openid去数据库查 该用户 存在 更新一下sessionkey字段 isNew=false sessionkeyid=xx 不存在放并把以上3个字段新建一个用户(外加生成sessionkeyid) 返回结果 isNew=true sessionkeyid=xx
|
|
|
|
|
// Example userExample = new Example(OceanUser.class);
|
|
|
|
|
// Example.Criteria userExampleCriteria = userExample.createCriteria();
|
|
|
|
|
// userExampleCriteria.andEqualTo("openId",openid);
|
|
|
|
|
//
|
|
|
|
|
// OceanUser oceanUser = oceanUserMapper.selectOneByExample(userExample);
|
|
|
|
|
Map<String, Object> columnMap = new HashMap<>();
|
|
|
|
|
columnMap.put("open_id", openid);
|
|
|
|
|
List<MiniUser> miniUsers = miniUserMapper.selectByMap(columnMap);
|
|
|
|
|
|
|
|
|
|
// MiniUser miniUser = miniUsers.get(0);
|
|
|
|
|
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
|
|
|
|
|
@ -102,10 +94,7 @@ public class MiniAppService {
|
|
|
|
|
miniUser.setSessionKey(sessionKey);
|
|
|
|
|
miniUser.setOpenId(openid);
|
|
|
|
|
miniUser.setCreateDate(new Date());
|
|
|
|
|
// oceanUser.setSessionKey(sessionKey);
|
|
|
|
|
// oceanUser.setOpenId(openid);
|
|
|
|
|
// oceanUser.setUnionId(unionid);
|
|
|
|
|
// oceanUser.setSessionKeyId(id);
|
|
|
|
|
miniUser.setCertified(false);
|
|
|
|
|
miniUserMapper.insert(miniUser);
|
|
|
|
|
jsonObject.put("isNew",true);
|
|
|
|
|
jsonObject.put("userId",id);
|
|
|
|
@ -113,9 +102,7 @@ public class MiniAppService {
|
|
|
|
|
}else {
|
|
|
|
|
MiniUser miniUser = miniUsers.get(0);
|
|
|
|
|
miniUser.setSessionKey(sessionKey);
|
|
|
|
|
// oceanUser.setSessionKey(sessionKey);
|
|
|
|
|
miniUserMapper.updateById(miniUser);//是否是更新一个字段
|
|
|
|
|
// oceanUserMapper.updateByExampleSelective(oceanUser,userExample);
|
|
|
|
|
jsonObject.put("isNew",false);
|
|
|
|
|
jsonObject.put("userId",miniUser.getId());
|
|
|
|
|
jsonObject.put("openId",openid);
|
|
|
|
@ -143,15 +130,10 @@ public class MiniAppService {
|
|
|
|
|
String purePhoneNumber = phoneNoInfo.getPurePhoneNumber();
|
|
|
|
|
|
|
|
|
|
//todo 根据sessionKeyId 去update补全用户的手机号 然后返回user对象 sessionKey remove掉
|
|
|
|
|
// Example userExample = new Example(OceanUser.class);
|
|
|
|
|
// Example.Criteria userExampleCriteria = userExample.createCriteria();
|
|
|
|
|
// userExampleCriteria.andEqualTo("id",userId);
|
|
|
|
|
// OceanUser oceanUser = oceanUserMapper.selectOneByExample(userExample);
|
|
|
|
|
MiniUser miniUser = miniUserMapper.selectById(userId);
|
|
|
|
|
miniUser.setAreaCode(countryCode);
|
|
|
|
|
miniUser.setTelephone(purePhoneNumber);
|
|
|
|
|
miniUserMapper.updateById(miniUser);
|
|
|
|
|
// oceanUserMapper.updateByExampleSelective(oceanUser,userExample);
|
|
|
|
|
miniUser.setSessionKey(null);
|
|
|
|
|
miniUser.setOpenId(null);
|
|
|
|
|
return miniUser;
|
|
|
|
|