修改公会接口

application/api/controller/Guild.php

@@ -4,12 +4,11 @@ namespace app\api\controller;
 
 use app\common\controller\Api;
 use app\common\service\UserService;
-use fast\Random;
 use think\Db;
 use think\Exception;
 use Redis;
-use app\api\controller\Tenim;
 use app\common\service\RoomService;
+use app\common\library\Easemob;
 
 /**
  * 公会控制器
@@ -25,12 +24,14 @@ class Guild extends Api
     public function getGuildList() {
         $search = input("search","","string"); //搜索的字段 公会名称/公会ID
         $where = [];$whereOr = [];
-        $where['status'] = 1;
+        $where['g.status'] = 1;
         if (!empty($search)) {
-            $whereOr['name'] = array('like', '%' . $search . '%');
-            $whereOr['g_id'] = $search;
+            $whereOr['g.name'] = array('like', '%' . $search . '%');
+            $whereOr['g.g_id'] = $search;
         }
-        $res = Db::name('guild')->field("id,g_id,user_id,party_id,name,image,desc,member")
+        $res = Db::name('guild')->alias('g')->field("g.id,g.g_id,g.user_id,g.party_id,g.name,g.image,g.desc,g.member,
+        area.province_name,area.name as city_name")
+            ->join('shopro_area area','g.city_id = area.id','LEFT')
             ->where($where)
             ->where(function ($query) use($whereOr) {
                 $query->whereOr($whereOr);
@@ -77,7 +78,7 @@ class Guild extends Api
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
             ->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
-            ->join("hx_user u","a.user_id = u.id")
+            ->join("user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
         if(!$guildInfo || !$guildMemberInfo) $this->error("公会信息获取失败！");
 
@@ -148,7 +149,7 @@ class Guild extends Api
         // 获取公会成员信息
         $guildMemberInfo = \app\common\model\GuildMember::alias("a")
             ->field("a.id,a.user_id,a.role,u.nickname,u.avatar,u.gender")
-            ->join("hx_user u","a.user_id = u.id")
+            ->join("user u","a.user_id = u.id")
             ->where(["a.guild_id"=>$guild_id])->limit(10)->order("a.role","desc")->select();
 
         if(!$guildInfo) $this->error("公会信息获取失败！");
@@ -497,7 +498,7 @@ class Guild extends Api
         // 获取公会成员列表
         $guildMemberList = \app\common\model\GuildMember::alias("a")
             ->field("a.id,a.user_id,u.avatar,u.nickname,u.gender,a.role,u.is_online,u.onlinetime")
-            ->join("hx_user u","a.user_id = u.id")
+            ->join("user u","a.user_id = u.id")
             ->where($where)
             ->limit($pageStart,$pageNum)
             ->order("a.role","desc")
@@ -615,6 +616,10 @@ class Guild extends Api
             $memberInfo->updatetime = time();
             $res = $memberInfo->save();
             if($res) {
+                //[环信]取消聊天室管理员
+                $easemob = new Easemob();
+                $easemob->room_demoteRoomAdmin($guildInfo['easemob_room_id'],$memberInfo['user_id']);
+
                 $this->success("取消成功！");
             } else {
                 $this->error("网络错误，请稍后重试！");
@@ -645,16 +650,15 @@ class Guild extends Api
             $data["avatar"] = $memberuserInfo->avatar;
             $data["nickname"] = $memberuserInfo->nickname;
             $data["gender"] = $memberuserInfo->gender;
-            $data["level"] = $memberuserInfo->level;
             $data["item"] = 1;
             $data["time"] = 0;
             $data["createtime"] = time();
 
             $redis->hSet("party_manage_".$party_id,$memberuserInfo->id."-1",serialize($data));
 
-            // 腾讯im设置管理员
-//            $tenim = new Tenim();
-//            $tenim->setImManage($memberInfo['user_id'],$party_id);
+            //[环信]设置群组管理员
+            $easemob = new Easemob();
+            $easemob->room_promoteRoomAdmin($guildInfo['easemob_room_id'],$memberInfo['user_id']);
 
             $this->success("设置成功！");
         } else {
@@ -725,7 +729,7 @@ class Guild extends Api
                 $list = model('GiftUserParty')->alias("a")
                     ->field('sum(a.value) as total_price,a.user_to_id,u.avatar,u.nickname,u.is_online,u.onlinetime')
                     ->where($where)
-                    ->join('hx_user u','u.id = a.user_to_id')
+                    ->join('user u','u.id = a.user_to_id')
                     ->group('a.user_to_id')
                     ->order('total_price',"desc")
                     ->autopage()
@@ -777,19 +781,15 @@ class Guild extends Api
      */
     public function getStatus()
     {
-        try {
-            $id = input('guild_id',0);
-            if (!empty($id)) {
-                $where['id'] = $id;
-            } else {
-                $where['user_id'] = $this->auth->id;
-            }
-            $field = 'id,status';
-            $guild = model('Guild')->field($field)->where($where)->find();
-            $this->success('获取成功', $guild);
-        } catch (Exception $e) {
-            $this->error($e->getMessage());
+        $id = input('guild_id',0);
+        if (!empty($id)) {
+            $where['id'] = $id;
+        } else {
+            $where['user_id'] = $this->auth->id;
         }
+        $field = 'id,status';
+        $guild = model('Guild')->field($field)->where($where)->find();
+        $this->success('获取成功', $guild);
     }
 
     ///////////////没用到的///////////
@@ -855,7 +855,7 @@ class Guild extends Api
         $guild_id = input("guild_id"); //公会ID
         if($guild_id <= 0) $this->error("参数缺失！");
         $guildInfo = \app\common\model\Guild::alias("a")
-            ->join("hx_user u","u.id = a.user_id","inner")
+            ->join("user u","u.id = a.user_id","inner")
             ->field("a.id,a.image,a.name,a.g_id,a.user_id,u.avatar,u.nickname,u.u_id")
             ->where(["a.id"=>$guild_id])
             ->find();