| @@ -323,31 +323,18 @@ public class WxInfoController extends BaseController { | |||||
| } | } | ||||
| WxMaService wxMaService = getWeappService(appId); | WxMaService wxMaService = getWeappService(appId); | ||||
| WxAppinfo wxAppinfo = getAppInfo(appId); | |||||
| WxBuser buser = getBuser(); | |||||
| try { | try { | ||||
| // 解密 | // 解密 | ||||
| WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); | WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); | ||||
| if (null != phoneNoInfo) { | if (null != phoneNoInfo) { | ||||
| logger.info(phoneNoInfo.toString()); | 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 { | } else { | ||||
| return new ResultData(ErrorCode.PHONE_DECODE_ERR, resultMap); | return new ResultData(ErrorCode.PHONE_DECODE_ERR, resultMap); | ||||
| } | } | ||||