wesmiler 1 неделя назад
Родитель
Сommit
590bff91e3
2 измененных файлов с 3 добавлено и 3 удалено
  1. 2 2
      app/Http/Controllers/Api/webApp.php
  2. 1 1
      app/Services/Api/MemberService.php

+ 2 - 2
app/Http/Controllers/Api/webApp.php

@@ -14,6 +14,7 @@ namespace App\Http\Controllers\Api;
 use App\Helpers\Jwt;
 use App\Http\Controllers\BaseController;
 use App\Models\MemberModel;
+use App\Services\Api\MemberService;
 use App\Services\ConfigService;
 use App\Services\RedisService;
 use Illuminate\Support\Facades\DB;
@@ -114,8 +115,7 @@ class webApp extends BaseController
 
         // 登录用户信息
         if ($userId) {
-            $memberModel = new MemberModel();
-            $userInfo = $memberModel->getInfo($this->userId);
+            $userInfo = MemberService::make()->getInfo($this->userId);
             $this->userInfo = $userInfo;
             $this->userType = isset($userInfo['user_type']) && $userInfo['user_type']? $userInfo['user_type'] : 1;
             $this->areaId = isset($userInfo['area_id']) && $userInfo['area_id']? $userInfo['area_id'] : 0;

+ 1 - 1
app/Services/Api/MemberService.php

@@ -405,7 +405,7 @@ class MemberService extends BaseService
             return $info;
         }
 
-        $defaultField = ['id', 'user_type', 'realname', 'mobile','is_auth','member_level','idcard', 'nickname','parent_id','point_id', 'balance','ls_score','bd_score','property','property_total','withdraw_property','bonus_total','withdraw_total', 'code', 'openid','create_time', 'status', 'avatar'];
+        $defaultField = ['id', 'user_type', 'realname', 'mobile','is_auth','member_level','idcard','buy_type','area_id', 'nickname','parent_id','point_id', 'balance','ls_score','bd_score','property','property_total','withdraw_property','bonus_total','withdraw_total', 'code', 'openid','create_time', 'status', 'avatar'];
         $field = $field ? $field : $defaultField;
         if (is_array($where)) {
             $info = $this->model->with(['parent','point','levelData'])->where(['mark' => 1])->where($where)->select($field)->first();