Wesmiler

app/Services/Api/MemberService.php

@@ -196,17 +196,24 @@ class MemberService extends BaseService
         }
 
 
-        // 验证是否注册，没有则注册
-        $where = ['openid' => $openid];
         // 关联账号
+        $data = [];
         if($unionid){
             $where['unionid'] = $unionid;
-            unset($where['openid']);
+            $data = $this->model->where($where)
+                ->select(['id', 'openid','unionid', 'mobile', 'user_type', 'nickname', 'avatar', 'code', 'status', 'mark'])
+                ->first();
+            $data = $data ? $data->toArray() : [];
         }
-        $data = $this->model->where($where)
-            ->select(['id', 'openid','unionid', 'mobile', 'user_type', 'nickname', 'avatar', 'code', 'status', 'mark'])
-            ->first();
-        $data = $data ? $data->toArray() : [];
+
+        // 普通号
+        if(empty($data)){
+            $where = ['openid' => $openid];
+            $data = $this->model->where($where)
+                ->select(['id', 'openid','unionid', 'mobile', 'user_type', 'nickname', 'avatar', 'code', 'status', 'mark'])
+                ->first();
+        }
+
         $userId = isset($data['id']) ? $data['id'] : 0;
         $userAvatar = isset($data['avatar']) ? $data['avatar'] : '';
         $nickName = isset($data['nickname']) ? $data['nickname'] : '';