From 44c979d3c7fabbee69578c48f07d817909b1937a Mon Sep 17 00:00:00 2001
From: ASUS <515617283@qq.com>
Date: Thu, 27 Nov 2025 14:23:44 +0800
Subject: [PATCH] tb_shop_info edit

---
 app/chat/controller/GroupController.php | 49 +++++++++++++++++++++----
 1 file changed, 41 insertions(+), 8 deletions(-)

diff --git a/app/chat/controller/GroupController.php b/app/chat/controller/GroupController.php
index d7de37c..ddd09ef 100644
--- a/app/chat/controller/GroupController.php
+++ b/app/chat/controller/GroupController.php
@@ -56,14 +56,25 @@ class GroupController extends ApiController
                 'role' => 1, // 1=群主
                 'join_time' => $now,
             ]);
+            $user = Db::name('chat_user')->where(['user_id' => $this->uid])->find();
+            $data = [
+                'group_info' => [
+                    'id' => $group_id,
+                    'name' => $name,
+                    'avatar' => $avatar,
+                ],
+                'member_info' => [
+                    'user_id' => $this->uid,
+                    'avatar' => $user['avatar'],
+                    'nick_name' => $user['nick_name'],
+                ]
+            ];
             Db::commit();
-            return $this->success(['group_id' => $group_id]);
+            return $this->success($data);
         }catch (\Throwable $exception) {
             Db::rollback();
             return $this->error($exception->getMessage());
         }
-
-
     }
 
     /**
@@ -267,6 +278,17 @@ class GroupController extends ApiController
             return $this->error('你当前不是群主,无法转让');
         }
 
+        // 查询
+        $chat_user = Db::name('chat_user')->where([
+            'user_id' => $object_user_id,
+            'status' => 1,
+            'type' => 2,
+        ])->find();
+        if(!$chat_user) {
+            return $this->error('目标用户不存在');
+        }
+
+
         $res = Db::name('chat_group_member')->where([
             'group_id' => $group_id,
             'user_id' => $this->uid,
@@ -518,14 +540,25 @@ class GroupController extends ApiController
             return $this->error('用户不在群内');
         }
         // 获取成员列表
-        $members = Db::name('chat_group_member')->where([
+        $data['user_list'] = Db::name('chat_group_member')->where([
             'group_id' => $groupId,
             'quit_time' => null,
-            'is_kicked' => 0
+            'is_kicked' => 0,
         ])
-        ->alias('chat')
-        ->leftJoin('chat_user user', 'chat.user_id = user.user_id')
+        ->alias('member')
+        ->leftJoin('chat_user user', 'member.user_id = user.user_id')
+        ->field('member.id as id, user.id as user_id, role, nick_name, avatar')
+            ->order('member.id', 'asc')
         ->select();
-        return $this->success($members);
+
+        $data['grep_set'] = [
+            'is_not_disturb' => $targetIsMember['is_dist'],
+            'group_id' => $groupId
+        ];
+
+
+        return $this->success($data);
     }
 }
+
+