From cfd63d829dfac49c74255bdefe4f0bd0a1a0d53a Mon Sep 17 00:00:00 2001 From: yiyan Date: Sat, 21 Dec 2019 15:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=8F=82=E6=95=B0=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BE=AE=E4=BF=A1=E5=A4=B4=E5=83=8F=EF=BC=8C=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=89=8B=E6=9C=BA=E5=8F=B7=E6=96=B0=E5=A2=9E=E5=AF=86?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/action/UsersAction.java | 4 ++-- src/main/java/com/ifish/entity/User.java | 10 ++++++++ .../java/com/ifish/service/UserService.java | 2 +- .../ifish/serviceImpl/UserServiceImpl.java | 23 ++++++++++++++----- 4 files changed, 30 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/ifish/action/UsersAction.java b/src/main/java/com/ifish/action/UsersAction.java index f0ba966..e8ab187 100644 --- a/src/main/java/com/ifish/action/UsersAction.java +++ b/src/main/java/com/ifish/action/UsersAction.java @@ -115,8 +115,8 @@ public class UsersAction { * @return */ @RequestMapping(value="/bindPhone",method=RequestMethod.GET) - public JsonResult bindPhone(String unionId, String phoneNum) { - return userService.bindPhone(unionId, phoneNum); + public JsonResult bindPhone(String unionId, String phoneNum, String password) { + return userService.bindPhone(unionId, phoneNum, password); } /** diff --git a/src/main/java/com/ifish/entity/User.java b/src/main/java/com/ifish/entity/User.java index cb4425a..fe47633 100644 --- a/src/main/java/com/ifish/entity/User.java +++ b/src/main/java/com/ifish/entity/User.java @@ -137,6 +137,8 @@ public class User implements Serializable{ @Column(name = "wechat_unionid") private String wechatUnionid; + private String wechatImgUrl; + /** * 修改时间 */ @@ -302,4 +304,12 @@ public class User implements Serializable{ public void setWechatUnionid(String wechatUnionid) { this.wechatUnionid = wechatUnionid; } + + public String getWechatImgUrl() { + return wechatImgUrl; + } + + public void setWechatImgUrl(String wechatImgUrl) { + this.wechatImgUrl = wechatImgUrl; + } } diff --git a/src/main/java/com/ifish/service/UserService.java b/src/main/java/com/ifish/service/UserService.java index c50406b..4773a62 100644 --- a/src/main/java/com/ifish/service/UserService.java +++ b/src/main/java/com/ifish/service/UserService.java @@ -58,7 +58,7 @@ public interface UserService { * @param phone * @return */ - public JsonResult bindPhone(String unionId, String phone); + public JsonResult bindPhone(String unionId, String phone, String password); /** * 更多用户数据信息 diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index 7338b8f..3887807 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -319,6 +319,8 @@ public class UserServiceImpl implements UserService { if (wechatUserInfo == null || wechatUserInfo.size() == 2) { throw new IfishException(ResultEnum.error403); } + //微信头像 + String headimgurl = wechatUserInfo.getString("headimgurl"); //用户信息 User user = userDao.findUniqueByProperty(Restrictions.eq("wechatUnionid",wechatUserInfo.getString("unionid"))); if (user == null) { @@ -387,6 +389,8 @@ public class UserServiceImpl implements UserService { /** * 登录返回信息 */ + //微信头像 + user.setWechatImgUrl(headimgurl); //用户信息 json.put("user", getUserInfo(user,gwellParam)); //用户资产 @@ -484,7 +488,7 @@ public class UserServiceImpl implements UserService { } @Override - public JsonResult bindPhone(String unionId, String phone) { + public JsonResult bindPhone(String unionId, String phone, String password) { if (unionId == null || phone == null) { throw new IfishException(ResultEnum.error401); } @@ -495,7 +499,8 @@ public class UserServiceImpl implements UserService { } User userPhone = userDao.findUniqueByProperty(Restrictions.eq("phoneNumber",phone)); if (userPhone == null) { - throw new IfishException(ResultEnum.fail101); + userWechat.setPhoneNumber(phone); + userWechat.setUserPassword(password); } List deviceUserListWechat = deviceUserDao.findByProperty(Restrictions.eq("priId.userId", userWechat.getUserId())); List deviceUserListPhone = deviceUserDao.findByProperty(Restrictions.eq("priId.userId", userPhone.getUserId())); @@ -551,10 +556,15 @@ public class UserServiceImpl implements UserService { // tbl_Camera_User_Mapper.updateCameraUserId(userPhone.getUserId(), Integer.valueOf(cameraUser.getCameraUserId().getCameraId())); } } - //修改手机账号的微信unionid - userPhone.setWechatUnionid(userWechat.getWechatUnionid()); - userDao.update(userPhone); - userDao.delete(userWechat); + if (userPhone != null) { + //修改手机账号的微信unionid + userPhone.setWechatUnionid(userWechat.getWechatUnionid()); + userDao.update(userPhone); + userDao.delete(userWechat); + } else { + userDao.update(userWechat); + } + //用户资产信息 UserAssetDto userAssetDtoWechat = getUserAssetInfo(userWechat.getUserId()); UserAssetDto userAssetDtoPhone = getUserAssetInfo(userPhone.getUserId()); @@ -1277,6 +1287,7 @@ public class UserServiceImpl implements UserService { json.put("gwellUserID", user.getGwellUserID()); json.put("neteaseToken", user.getNeteaseToken()); json.put("userType", user.getUserType()); + json.put("wechatImgUrl", user.getWechatImgUrl()); json.put("shopsUserId", user.getShopsUserId()); return json; }