|
|
@@ -13,6 +13,7 @@ namespace App\Services\Common;
|
|
|
|
|
|
use App\Models\MemberModel;
|
|
|
use App\Models\MemberPaymentModel;
|
|
|
+use App\Models\User;
|
|
|
use App\Services\BaseService;
|
|
|
use App\Services\ConfigService;
|
|
|
use Earnp\GoogleAuthenticator\GoogleAuthenticator;
|
|
|
@@ -35,6 +36,7 @@ class MemberPaymentService extends BaseService
|
|
|
{
|
|
|
$this->model = new MemberPaymentModel();
|
|
|
$this->memberModel = new MemberModel();
|
|
|
+ $this->userModel = new User();
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -188,8 +190,9 @@ class MemberPaymentService extends BaseService
|
|
|
return returnJson('请输入您的谷歌验证码,或先绑定再来操作', false);
|
|
|
}
|
|
|
|
|
|
-// $userInfo = UserService::make()->getUserInfoByUserId($userId);
|
|
|
- $userInfo = UserService::make()->getUserInfoByUserId($userId);
|
|
|
+ $userInfo = $this->userModel->where(['user_id'=> $userId,'mark'=>1])
|
|
|
+ ->select(['id','user_id'],'google_secret','status')
|
|
|
+ ->first();
|
|
|
if(empty($userInfo)){
|
|
|
return returnJson('您的账号异常无法操作,请联系客服处理', false);
|
|
|
}
|