|
@@ -51,11 +51,10 @@ class CommonController extends Controller
|
|
|
|
|
|
$session_key = !empty($data['session_key']) ? $data['session_key'] : '';
|
|
$session_key = !empty($data['session_key']) ? $data['session_key'] : '';
|
|
$user = User::select(['id', 'status', 'phone', 'nickname', 'avatar'])->where('openid', $data['openid'])->first();
|
|
$user = User::select(['id', 'status', 'phone', 'nickname', 'avatar'])->where('openid', $data['openid'])->first();
|
|
- \Log::info($data);
|
|
|
|
|
|
+
|
|
if (empty($user)){
|
|
if (empty($user)){
|
|
$add = [
|
|
$add = [
|
|
'openid' => $data['openid'],
|
|
'openid' => $data['openid'],
|
|
- 'unionid' => $data['unionId']?? '',
|
|
|
|
'latitude' => $req['latitude'] ?? 0,
|
|
'latitude' => $req['latitude'] ?? 0,
|
|
'longitude' => $req['longitude'] ?? 0,
|
|
'longitude' => $req['longitude'] ?? 0,
|
|
'phone' => $req['phone'] ?? '',
|
|
'phone' => $req['phone'] ?? '',
|
|
@@ -77,7 +76,6 @@ class CommonController extends Controller
|
|
|
|
|
|
$update = [
|
|
$update = [
|
|
'nickname' => $req['nickname'] ?? '',
|
|
'nickname' => $req['nickname'] ?? '',
|
|
- 'unionid' => $data['unionId']?? '',
|
|
|
|
'avatar' => $req['avatar'] ?? '',
|
|
'avatar' => $req['avatar'] ?? '',
|
|
'latitude' => $req['latitude'] ?? 0,
|
|
'latitude' => $req['latitude'] ?? 0,
|
|
'longitude' => $req['longitude'] ?? 0,
|
|
'longitude' => $req['longitude'] ?? 0,
|
|
@@ -125,10 +123,11 @@ class CommonController extends Controller
|
|
if (empty($decryptedData['phoneNumber'])) {
|
|
if (empty($decryptedData['phoneNumber'])) {
|
|
return out(null, 10002, '授权手机号错误');
|
|
return out(null, 10002, '授权手机号错误');
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ if(isset($decryptedData['unionId']))$data['unionid'] = $decryptedData['unionId'];
|
|
if (!User::where('openid', $data['openid'])->exists()){
|
|
if (!User::where('openid', $data['openid'])->exists()){
|
|
$user = User::create([
|
|
$user = User::create([
|
|
'openid' => $data['openid'],
|
|
'openid' => $data['openid'],
|
|
|
|
+ 'unionid' => $data['unionid'],
|
|
'phone' => $decryptedData['phoneNumber'],
|
|
'phone' => $decryptedData['phoneNumber'],
|
|
'session_key' => $data['session_key'],
|
|
'session_key' => $data['session_key'],
|
|
'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
|
|
'avatar' => request()->getScheme().'://'.request()->getHost().'/img/default-head.png',
|