From 32f6a5cbdb16c9e90620a2bcea32ec3c34ba8767 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 25 Sep 2019 17:18:27 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF=E5=95=86=E6=88=B7][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E6=8E=88=E6=9D=83=E6=89=8B=E6=9C=BA=E5=8F=B7]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxInfoController.java | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 77d55a6ac..6dfb3176f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -323,31 +323,18 @@ public class WxInfoController extends BaseController { } WxMaService wxMaService = getWeappService(appId); - - WxAppinfo wxAppinfo = getAppInfo(appId); + WxBuser buser = getBuser(); try { // 解密 WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); if (null != phoneNoInfo) { logger.info(phoneNoInfo.toString()); - String phone = phoneNoInfo.getPhoneNumber(); - resultMap.put("phone", phone); - - MallUserInfo user = mallUserInfoService.getByPhone(phone, wxAppinfo.getTenantId()); - if(user == null) { - return new ResultData(ErrorCode.USER_NO_PERMISSION, resultMap); - } - if (mallUserRoleService.checkIsMobileAdmin(user)) { - resultMap.put("phone", user.getPhone()); - resultMap.put("admin", "1"); - - user.setBopenId(openId); - mallUserInfoService.saveOrUpdate(user); - - return new ResultData(resultMap); - } else { - return new ResultData(ErrorCode.USER_NO_PERMISSION, resultMap); - } + buser.setPhone(phoneNoInfo.getPhoneNumber()); + buser.setPurePhone(phoneNoInfo.getPurePhoneNumber()); + buser.setCountryCode(phoneNoInfo.getCountryCode()); + wxBuserService.saveOrUpdate(buser); + resultMap.put("msg", "授权手机成功!"); + resultMap.put("phone", phoneNoInfo.getPhoneNumber()); } else { return new ResultData(ErrorCode.PHONE_DECODE_ERR, resultMap); }