|
|
@@ -562,7 +562,6 @@ class MemberService extends BaseService
|
|
|
$code = isset($params['code']) ? $params['code'] : '';
|
|
|
$scene = isset($params['scene']) ? $params['scene'] : '';
|
|
|
$appSources = isset($params['app_sources']) ? $params['app_sources'] : '';
|
|
|
- $inviteCode = isset($params['invite_code']) ? $params['invite_code'] : '';
|
|
|
if (empty($params) || empty($email) || empty($scene) || $code <= 0) {
|
|
|
$this->error = 2014;
|
|
|
return false;
|
|
|
@@ -577,9 +576,15 @@ class MemberService extends BaseService
|
|
|
// 验证是否注册,没有则注册
|
|
|
$data = $this->model->where(['email' => $email, 'mark' => 1])->select(['id', 'username','point_id', 'parent_id', 'code', 'status'])->first();
|
|
|
$data = $data ? $data->toArray() : [];
|
|
|
+
|
|
|
$userId = isset($data['id']) ? $data['id'] : 0;
|
|
|
$status = isset($data['status']) ? $data['status'] : 0;
|
|
|
- if ($userId && $status != 1) {
|
|
|
+ if(empty($data) || $userId<=0){
|
|
|
+ $this->error = 2001;
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if ($status != 1) {
|
|
|
$this->error = 2015;
|
|
|
return false;
|
|
|
}
|