|
|
|
@@ -162,11 +162,6 @@ public class WxInfoController extends BaseController { |
|
|
|
// if (StringUtils.isNotBlank(buUser.getParentTenantId())) { |
|
|
|
// request.setAttribute(Constant.PARENT_TENANT_ID, buUser.getParentTenantId()); |
|
|
|
// } |
|
|
|
try { |
|
|
|
checkLoginUserPhone(buUser, buUser.getId(),appPlat); |
|
|
|
}catch(Exception e) { |
|
|
|
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); |
|
|
|
} |
|
|
|
return new ResultData(resultMap); |
|
|
|
|
|
|
|
} |
|
|
|
@@ -286,7 +281,6 @@ public class WxInfoController extends BaseController { |
|
|
|
|
|
|
|
user.setBopenId(buser.getOpenId()); |
|
|
|
mallUserInfoService.saveOrUpdate(user); |
|
|
|
|
|
|
|
return new ResultData(resultMap); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.USER_NO_PERMISSION.getCode(),user.getName()+"不是超管或者没有数据塔台的权限", resultMap); |
|
|
|
@@ -343,6 +337,13 @@ public class WxInfoController extends BaseController { |
|
|
|
String phone = cuserFactory.getBUserService(appPlat).decryptPhoneNoInfo(encryptedData, iv, buser, wxAppinfo, isFmOpen); |
|
|
|
resultMap.put("msg", "授权手机成功!"); |
|
|
|
resultMap.put("phone", phone); |
|
|
|
|
|
|
|
try { |
|
|
|
checkLoginUserPhone(buser, phone,this.getLoginBUser().getPhone()); |
|
|
|
}catch(Exception e) { |
|
|
|
return new ResultData(ErrorCode.SYS_SERVER_ERROR.getCode(),e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
return new ResultData(resultMap); |
|
|
|
} catch (Exception e) { |
|
|
|
this.logger.error(e.getMessage(), e); |
|
|
|
|