|
|
@ -339,11 +339,11 @@ public class WechatController { |
|
|
|
HttpServletRequest request, HttpServletResponse response) { |
|
|
|
HttpServletRequest request, HttpServletResponse response) { |
|
|
|
try { |
|
|
|
try { |
|
|
|
|
|
|
|
|
|
|
|
HighUser user = highUserService.findByOpenId(openId); |
|
|
|
HighUser user = highUserService.findByOpenIdH5(openId); |
|
|
|
|
|
|
|
|
|
|
|
if (user == null) { |
|
|
|
if (user == null) { |
|
|
|
user = new HighUser(); |
|
|
|
user = new HighUser(); |
|
|
|
user.setName("用户" + IDGenerator.nextId(5)); |
|
|
|
user.setName("临时游客"); |
|
|
|
user.setRegTime(new Date()); |
|
|
|
user.setRegTime(new Date()); |
|
|
|
user.setGold(0); |
|
|
|
user.setGold(0); |
|
|
|
user.setOpenId(openId); |
|
|
|
user.setOpenId(openId); |
|
|
@ -353,7 +353,7 @@ public class WechatController { |
|
|
|
// 1:需要填写用户信息
|
|
|
|
// 1:需要填写用户信息
|
|
|
|
// 2:需要填写手机号
|
|
|
|
// 2:需要填写手机号
|
|
|
|
user.setInfoCompleteStatus(1); |
|
|
|
user.setInfoCompleteStatus(1); |
|
|
|
highUserService.insertUser(user , null , null); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 定义个人所有数据
|
|
|
|
// 定义个人所有数据
|
|
|
@ -361,7 +361,7 @@ public class WechatController { |
|
|
|
HighUser detailData = highUserService.getDetailDataByUser(user.getId()); |
|
|
|
HighUser detailData = highUserService.getDetailDataByUser(user.getId()); |
|
|
|
detailData.setPassword(null); |
|
|
|
detailData.setPassword(null); |
|
|
|
highUserModel.setHighUser(detailData); |
|
|
|
highUserModel.setHighUser(detailData); |
|
|
|
SessionObject so = new SessionObject(user.getOpenId(), 1, highUserModel); |
|
|
|
SessionObject so = new SessionObject(user.getPhone(), 1, highUserModel); |
|
|
|
userCenter.save(request, response, so); |
|
|
|
userCenter.save(request, response, so); |
|
|
|
return ResponseMsgUtil.success(so); |
|
|
|
return ResponseMsgUtil.success(so); |
|
|
|
|
|
|
|
|
|
|
|