|
@@ -4,19 +4,23 @@ namespace App\Http\Controllers\Api;
|
|
|
|
|
|
|
|
use Illuminate\Http\Request;
|
|
use Illuminate\Http\Request;
|
|
|
use App\Http\Controllers\Controller;
|
|
use App\Http\Controllers\Controller;
|
|
|
-
|
|
|
|
|
|
|
+use App\Models;
|
|
|
class UserController extends Controller
|
|
class UserController extends Controller
|
|
|
{
|
|
{
|
|
|
|
|
+
|
|
|
//
|
|
//
|
|
|
function getUserDetails(Request $req){
|
|
function getUserDetails(Request $req){
|
|
|
- $uid=S('token_user_id');
|
|
|
|
|
- $user=\App\Models\Member::where('id',$uid)->first();
|
|
|
|
|
- if(!$user){
|
|
|
|
|
|
|
+ $uid = S('token_user_id');
|
|
|
|
|
+ $user = Models\Member::where('id',$uid)->first();
|
|
|
|
|
+ $userdetails = Models\MembersDetailed::where('members_id',$uid)->first();
|
|
|
|
|
+ if(!$user||!$userdetails){
|
|
|
return toJson(-20002);
|
|
return toJson(-20002);
|
|
|
}
|
|
}
|
|
|
$user=$user->toArray();
|
|
$user=$user->toArray();
|
|
|
|
|
+ $userdetails = $userdetails->toArray();
|
|
|
unset($user['password']);
|
|
unset($user['password']);
|
|
|
unset($user['solt']);
|
|
unset($user['solt']);
|
|
|
- return toJson($user);
|
|
|
|
|
|
|
+ $userdata = array_merge($user,$userdetails);
|
|
|
|
|
+ return toJson($userdata);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|