Commit 22e940e2 by 白满斌

手机号

parent 83df13eb
...@@ -36,8 +36,8 @@ class LoginController extends BaseController ...@@ -36,8 +36,8 @@ class LoginController extends BaseController
public function getWxPhone(Request $request){ public function getWxPhone(Request $request){
$code = $request->get('code', ""); // $code = $request->get('code', ""); //
$openid = $request->get('openid', ""); // $openid = $request->get('openid', ""); //
$nickName = $request->get('nick_name', ""); //
$platform = $request->get('platform', ""); // $platform = $request->get('platform', ""); //
$owner = $request->get('owner', ""); //
if(empty($code)){ if(empty($code)){
return $this->respondError(10001, 'code码异常'); return $this->respondError(10001, 'code码异常');
} }
...@@ -48,7 +48,7 @@ class LoginController extends BaseController ...@@ -48,7 +48,7 @@ class LoginController extends BaseController
// return $this->respondError(10001, '昵称不能为空'); // return $this->respondError(10001, '昵称不能为空');
// } // }
$data = $this->loginService->getWxPhoneService($code , $openid, $platform, $nickName); $data = $this->loginService->getWxPhoneService($code , $openid, $platform, $owner);
return $this->respond($data); return $this->respond($data);
} }
......
...@@ -139,9 +139,9 @@ class LoginService ...@@ -139,9 +139,9 @@ class LoginService
} }
$isNeedAuth = 0; $isNeedAuth = 0;
// if(empty($phone)){ if(empty($phone)){
// $isNeedAuth = 1; $isNeedAuth = 1;
// } }
//生成auth //生成auth
$info = [ $info = [
'id' => $userId, 'id' => $userId,
...@@ -184,7 +184,7 @@ class LoginService ...@@ -184,7 +184,7 @@ class LoginService
} }
//获取用户信息 //获取用户信息
$loginRet = $this->loginAppletHandle($apiServiceRet['data']['openid'], $platform); $loginRet = $this->loginAppletHandle($apiServiceRet['data']['openid'], $platform, "", '');
if($loginRet['code'] != 0){ if($loginRet['code'] != 0){
return $loginRet; return $loginRet;
} }
...@@ -232,7 +232,7 @@ class LoginService ...@@ -232,7 +232,7 @@ class LoginService
} }
public function getWxPhoneService($code, $openid, $platform, $nickName = ""){ public function getWxPhoneService($code, $openid, $platform, $owner = ""){
try { try {
$accessTokenRet = self::getWXAccessTokenService(); $accessTokenRet = self::getWXAccessTokenService();
...@@ -250,7 +250,7 @@ class LoginService ...@@ -250,7 +250,7 @@ class LoginService
} }
$phoneInfo = $apiServiceRet['data']; $phoneInfo = $apiServiceRet['data'];
//如果走到这一步,那就需要注册用户并登录 //如果走到这一步,那就需要注册用户并登录
$authRet = $this->loginAppletHandleForGetPhone($openid, $platform, $phoneInfo['purePhoneNumber'], $nickName); $authRet = $this->loginAppletHandleForGetPhone($openid, $platform, $phoneInfo['purePhoneNumber'], $owner);
if($authRet['code'] != 0){ if($authRet['code'] != 0){
return $authRet; return $authRet;
} }
...@@ -264,7 +264,7 @@ class LoginService ...@@ -264,7 +264,7 @@ class LoginService
} }
public function loginAppletHandleForGetPhone($openid, $platform, $phone, $userName ) { public function loginAppletHandleForGetPhone($openid, $platform, $phone, $owner ) {
$where = [ $where = [
'openid'=>$openid, 'openid'=>$openid,
...@@ -274,14 +274,14 @@ class LoginService ...@@ -274,14 +274,14 @@ class LoginService
if (empty($findRetdata)){ if (empty($findRetdata)){
$insertUser = [ $insertUser = [
'openid' => $openid, 'openid' => $openid,
'user_name' => $userName,
'phone' => $phone, 'phone' => $phone,
'referrer_name' => $owner,
]; ];
$userId= $frontUserModel->insertData($insertUser); $userId= $frontUserModel->insertData($insertUser);
}else{ }else{
$insertUser = [ $insertUser = [
'user_name' => $userName,
'phone' => $phone, 'phone' => $phone,
'referrer_name' => $owner,
]; ];
$frontUserModel->updateData($where ,$insertUser); $frontUserModel->updateData($where ,$insertUser);
$userId = $findRetdata['id']; $userId = $findRetdata['id'];
...@@ -304,7 +304,7 @@ class LoginService ...@@ -304,7 +304,7 @@ class LoginService
$LoginCacheModel = new LoginCacheModel(); $LoginCacheModel = new LoginCacheModel();
$LoginCacheModel->insertData($insert); $LoginCacheModel->insertData($insert);
return ['code'=>0, 'msg'=>'success','data'=>['Authorization'=>$auth, 'phone'=>$phone,'user_name'=>$userName, 'openid'=>$openid, return ['code'=>0, 'msg'=>'success','data'=>['Authorization'=>$auth, 'phone'=>$phone,'user_name'=>"", 'openid'=>$openid,
'isNeedAuth'=> $isNeedAuth, 'info'=>$info]]; 'isNeedAuth'=> $isNeedAuth, 'info'=>$info]];
} }
......
...@@ -147,6 +147,9 @@ class SchoolService extends BaseService{ ...@@ -147,6 +147,9 @@ class SchoolService extends BaseService{
$boundary = 'nearby(' . $location . ',50000,1)'; $boundary = 'nearby(' . $location . ',50000,1)';
$aroundUrl = self::$localAround . 'key=' . $gdKey . '&keyword=' . $keyword . '&boundary=' . $boundary . '&filter=category=' . self::$around[$aroundName]; $aroundUrl = self::$localAround . 'key=' . $gdKey . '&keyword=' . $keyword . '&boundary=' . $boundary . '&filter=category=' . self::$around[$aroundName];
$requestRetAround = self::sendGetAround($aroundUrl); $requestRetAround = self::sendGetAround($aroundUrl);
if($requestRetAround['code'] != 0){
return $requestRetAround;
}
$aroundData = [ $aroundData = [
'place_id'=>$placeid, 'place_id'=>$placeid,
'name'=>$aroundName, 'name'=>$aroundName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment