家族调整

application/api/controller/Guild.php

@@ -173,7 +173,7 @@ class Guild extends Api
         $where['status'] = 1;
         $whereOr['name'] = array('like', '%' . $search . '%');
         $whereOr['g_id'] = $search;
-        $res = \app\common\model\Guild::field("id,g_id,name,image")
+        $res = \app\common\model\Guild::field("id,g_id,user_id,party_id,name,image,desc,member")
             ->where($where)
             ->where(function ($query) {
                 global $whereOr;

application/api/controller/User.php

@@ -16,7 +16,7 @@ use think\Db;
  */
 class User extends Api
 {
-    protected $noNeedLogin = ['login', 'onLogin', 'mobilelogin', 'register', 'resetpwd', 'changemobile', 'third', 'getUserOpenid', 'wxMiniProgramLogin','getNickName'];
+    protected $noNeedLogin = ['login', 'onLogin', 'mobilelogin', 'register', 'resetpwd', 'changemobile', 'third', 'getUserOpenid', 'wxMiniProgramLogin','getNickName','wechatlogin'];
     protected $noNeedRight = '*';
 
     public function _initialize()
@@ -711,8 +711,8 @@ class User extends Api
     public function wechatlogin(){
 //        $nickname = input('nickname','');
 //        $avatar = input('avatar','');
-//        $gender = input('gender',1);
-        $wechat_openid = input('wechat_openid','');
+        $gender = input('gender',1);
+        $wechat_openid = input('openid','');
 
         if (!$wechat_openid) {
             $this->error(__('Invalid parameters'));
@@ -748,7 +748,7 @@ class User extends Api
 //                'avatar'=>$avatar,
 //                'gender'=>$gender,
                 'register_from' => input('register_from',''),
-                'gender' => -1
+                'gender' => $gender,
             ];
             $ret = $this->auth->openid_register($wechat_openid,$reg_data);
             //亿米
@@ -757,7 +757,7 @@ class User extends Api
             }*/
         }
         if ($ret) {
-            $data = $this->userInfo('return');
+            $data = ['userinfo' => $this->auth->getUserinfo()];
             $this->success(__('Logged in successful'), $data);
         } else {
             $this->error($this->auth->getError());

application/api/controller/Usercenter.php

@@ -90,27 +90,34 @@ class UserCenter extends Common
         $blackList = model('UserBlacklist')->where($blackWhere)->select();
         $blackIds = !empty($blackList) ? array_column($blackList,'black_user_id') : [];
         $userInfo['is_black'] = in_array($user_id,$blackIds) ? 1 : 0;
-        //家族信息
-        $userInfo['guild_info'] = json([]);
+
         $memberinfo = Db::name('guild_member')->alias('m')->field('guild.name,guild.image,guild.member,guild.desc')->join('guild','m.guild_id = guild.id','LEFT')->where(['m.user_id'=>$user_id,'m.status'=>1])->find();
         if ($memberinfo) {
             $userInfo['memberinfo'] = $memberinfo;
         }
+        //家族信息
+        $guildField = 'id,g_id,user_id,party_id,name,image,desc,member';
+        $guildWhere['status'] = 1;
+        $guildWhere['user_id'] = $user_id;
+        $guildInfo = model('Guild')->field($guildField)->where($guildWhere)->find();
+        $userInfo['guild_info'] = !empty($guildInfo) ? $guildInfo : [];
         //动态
         //技能
         //礼物
 
         //访客记录
-        $visit_data = [
-            'user_id' => $this->auth->id,
-            'visit_user_id' => $user_id,
-        ];
-        $visit_check = Db::name('user_visitlist')->where($visit_data)->find();
-        if(empty($visit_check)){
-            $visit_data['updatetime'] = time();
-            Db::name('user_visitlist')->insertGetId($visit_data);
-        }else{
-            Db::name('user_visitlist')->where('id',$visit_check['id'])->update(['updatetime'=>time()]);
+        if ($this->auth->id != $user_id) {
+            $visit_data = [
+                'user_id' => $this->auth->id,
+                'visit_user_id' => $user_id,
+            ];
+            $visit_check = Db::name('user_visitlist')->where($visit_data)->find();
+            if(empty($visit_check)){
+                $visit_data['updatetime'] = time();
+                Db::name('user_visitlist')->insertGetId($visit_data);
+            }else{
+                Db::name('user_visitlist')->where('id',$visit_check['id'])->update(['updatetime'=>time()]);
+            }
         }
 
         $this->success("获取成功！",$userInfo);

application/common/library/Auth.php

@@ -160,7 +160,7 @@ class Auth
         $time = time();
 
         $data = [
-            'u_id'      => $this->getUinqueId(8, $ids),
+            'u_id'      => $this->getUinqueId(8, [$ids]),
             'invite_no' => $this->getUinqueNo(8, $invite_no),
             'username'  => $username,
 //            'password'  => $password,
@@ -677,13 +677,13 @@ class Auth
         $ip = request()->ip();
         $time = time();
 
-        $introcode = User::column("introcode");
+        $introcode = User::column("invite_no");
 
         $data = [
             'wechat_openid'   => $wechat_openid,
-            //'avatar'   => 'https://meet-1251365327.cos.ap-beijing.myqcloud.com/uploads/20220314/f57ebce8a72b823912904fe76eda0909.png',
-            'avatar' => $extend['gender'] == 1 ? config('avatar_boy') : config('avatar_girl'),//config('site.domain_cdnurl').'/avatar.png',
-            'introcode' => $this->getUinqueNo(6, $introcode),
+            'gender'   => isset($extend['gender']) ? $extend['gender'] : 1,
+            'avatar' => isset($extend["avatar"]) ? $extend["avatar"] : '/assets/dc0f37f043e1e9f5240ed87e37f18740.png',
+            'invite_no' => $this->getUinqueNo(6, $introcode),
             'nickname'  => get_rand_nick_name(),
         ];
         $params = array_merge($data, [
@@ -703,7 +703,7 @@ class Auth
             $user = User::create($params, true);
 
             $this->_user = User::get($user->id);
-            $this->_user->u_id = $this->getUinqueId(8, $user->id);
+            $this->_user->u_id = $this->getUinqueId(8, [$user->id]);
             $this->_user->save();
 
             //设置Token
@@ -723,7 +723,7 @@ class Auth
             Hook::listen("user_register_successed", $this->_user, $data);
             \app\common\model\NewBagHave::insert(["user_id" => $user->id, "createtime" => time()]);
             Db::commit();
-        } catch (Exception $e) {
+        } catch (Exception $e) {echo '<pre>';var_dump($e->getLine());exit;
             $this->setError($e->getMessage());
             Db::rollback();
             return false;