派对直播合并，直播改动

application/api/controller/Baseconfig.php

@@ -22,7 +22,7 @@ class Baseconfig extends Api
             'android_update_version' => config('site.android_update_version'),
             'ios_update_num' => config('site.ios_update_num'),
             'ios_update_version' => config('site.ios_update_version'),
-            'livebc_type' => Db::name('livebc_type')->order('id asc')->select(),
+            'livebc_type' => Db::name('party_type')->where('room_type',2)->order('id asc')->select(),
         ];
 
         $this->success('success',$config);

application/api/controller/Livebc.php

@@ -63,48 +63,6 @@ class Livebc extends Api
         $this->success('success',$info);
     }
 
-    //开播
-    public function start(){
-        $type_id = input('type_id','');
-        $title   = input('title','');
-        $cityname = input('cityname','');
-
-        if(empty($type_id) || empty($title)){
-            $this->error();
-        }
-
-        $data = [
-            'type_id' => $type_id,
-            'party_name'   => $title,
-            'cityname' => $cityname,
-            'is_online' => 1,
-            'updatetime' => time(),
-        ];
-
-        Db::startTrans();
-        $find = Db::name('party')->where('user_id',$this->auth->id)->lock(true)->find();
-        if($find){
-            $rs = Db::name('party')->where('id',$find['id'])->update($data);
-        }else{
-            $data['user_id'] = $this->auth->id;
-            $data['createtime'] = time();
-            $rs = Db::name('party')->insertGetId($data);
-        }
-        if($rs === false){
-            Db::rollback();
-            $this->error('开播失败');
-        }
-        //修改用户表直播状态
-        $rs_user = Db::name('user')->where('id',$this->auth->id)->update(['is_livebc' => 1]);
-        if($rs_user === false){
-            Db::rollback();
-            $this->error('开播失败');
-        }
-
-        Db::commit();
-        $this->success('success');
-    }
-
     //直播送礼物
     public function givegift() {
         // 接口防并发

application/api/controller/Party.php

@@ -35,7 +35,11 @@ class Party extends Common
      * 创建/进入派对
      */
     public function createParty() {
-        $room_type = 1;
+        $room_type = $this->request->request('room_type',1); // 房间类型:1=派对，2=直播
+        $party_name = $this->request->request('party_name',0);
+        $party_type = $this->request->request('party_type',0); // 派对类型（情感互动,心动点单 等）语聊房的
+        $cityname = input('cityname','');//直播城市
+
         $partyModel = new \app\common\model\Party();
 
         $user_id = $this->auth->id;
@@ -69,11 +73,10 @@ class Party extends Common
                 $this->error("房间数量已达上线，请联系客服！");
             }
 
-            $party_name = $this->auth->username."的房间"; // 派对名称
+            $party_name = $party_name ? $party_name : $this->auth->username."的房间"; // 派对名称
             $party_logo = "/assets/api/party_logo.png"; // 派对logo
             $party_notice = "请编辑房间公告"; // 派对公告
             $party_notice_detail = "请编辑房间公告内容！"; // 派对公告详情
-
             $party_ids = $partyModel->column("party_id");
             // 创建派对ID (临时ID四位，派对数不超过8999)
             $party_id = $this->auth->getUinqueId(6,$party_ids);
@@ -87,19 +90,24 @@ class Party extends Common
             $data["party_hot"] = 0;
             $data["party_name"] = $party_name;
             $data["party_logo"] = $party_logo;
-            $data["party_type"] = 0; // 派对类型（情感互动,心动点单 等）
+            $data["party_type"] = $party_type;
             $data["party_notice"] = $party_notice;
             $data["party_notice_detail"] = $party_notice_detail;
             $data["is_online"] = 1;
             $data["status"] = 0;
             $data["is_recommend"] = 0;
             $data["createtime"] = time();
+            $data["cityname"] = $cityname;
             $id = $partyModel->insertGetId($data);
             if(!$id) {
                 $this->error("派对创建失败，请稍后重试！");
             }
             $data["id"] = $id;
 
+            if($room_type == 2) {
+                \app\common\model\User::update(["is_livebc"=>1],["id"=>$user_id]);
+            }
+
             $partyInfo = $partyModel->where(["id"=>$id])->find();
             $partyInfo["is_new"] = 1;
 
@@ -109,9 +117,9 @@ class Party extends Common
                 $userInfo = \app\common\model\User::field("id,nickname,avatar")->where(["id"=>$partyInfo["naming"]])->find();
             }
             // 头像
-            /*if($partyInfo["user_id"] > 0 && $room_type == 2) {
+            if($partyInfo["user_id"] > 0 && $room_type == 2) {
                 $partyInfo["avatar"] = \app\common\model\User::where(["id"=>$partyInfo["user_id"]])->value("avatar");
-            }*/
+            }
             // 派对类型
             $partyTypeName = "普通房";
             if($partyInfo["party_type"]) {
@@ -782,8 +790,8 @@ class Party extends Common
         $list = $partycellectionModel->alias("a")
             ->field("a.party_id,r.party_logo,r.party_hot,r.party_id as r_id,r.party_name,t.id as party_type_id,t.name as party_type")
             ->where($where)
-            ->join("hx_party r","a.party_id = r.id")
-            ->join("hx_party_type t","t.id = r.party_type","left")
+            ->join("party r","a.party_id = r.id")
+            ->join("party_type t","t.id = r.party_type","left")
             ->limit($pageStart,$pageNum)
             ->select();