diff --git a/application/api/model/SendGift.php b/application/api/model/SendGift.php index c73e3f62..da494260 100644 --- a/application/api/model/SendGift.php +++ b/application/api/model/SendGift.php @@ -74,8 +74,8 @@ class SendGift extends Model //送礼 开启事务 Db::startTrans(); - - if($room_label == 11){//酒吧房下的小黑屋 房间流水和送礼记录、收益 都记录在酒吧房 + //酒吧房下的小黑屋 房间流水和送礼记录、收益 都记录在酒吧房 + if($room_label == 11){ $p_room_id = db::name('vs_room_bar_movie')->where('room_id',$room_id)->value('p_room_id'); //金币购买送礼 1金币购买 2送背包礼物 if($type == 1){ @@ -446,16 +446,6 @@ class SendGift extends Model } if($gift_info['label'] == 2) {//趣味礼物(盲盒) -// if($gift_box){ -// foreach ($gift_box as $i => $v){ -// //记录一下收礼记录 -// $give_gift = $this -> change_user_give_gift_logs($uid,$v['gift_id'],$v['gift_price'],1,$to_uid,2,$type,$room_id,'',0,2); -// if(!$give_gift){ -// Db::rollback(); -// return ['code' => 0, 'msg' => '送礼失败,请重试!!', 'data' => null]; -// } -// } -// } $give_gift = $this -> change_user_give_gift_logs($uid,$gid,$receive_gift_total,$num,$to_uid,2,$type,$room_id,$gift_box_str,0,2); }else{ //收礼记录行为日志 @@ -485,8 +475,8 @@ class SendGift extends Model Db::commit(); } - - //各种需要的及时推送 + //各种需要的及时推送======================================== + //pk信息 $room_pk = Db::name('vs_room_pk')->where(['status' => 3, 'room_id_a' => $room_id])->field('pk_id')->find(); if (!empty($room_pk)) { // 当前 room_id 是 room_id_a 修改create_value_a @@ -522,7 +512,8 @@ class SendGift extends Model } } - if($room_type == 6){ + //非酒吧房的私密房 送礼增加时长 + if($room_type == 6 && $room_label != 11){ //推送消息 交友房创建的私密房 倒计时增加 $add_time_str = get_system_config_value('room_cp_movie_add_time') ?? '1,1';//默认1金币增加1秒 //变成数组 @@ -546,7 +537,7 @@ class SendGift extends Model $ToUserInfo = model('User')->get_user_base_info($to_uid); $ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $to_uid,'room_id' => $room_id])->value('charm');//魅力 - //推送其他时刻需要的信息 其他放到异步回调里 + //盲盒礼物推送信息整合 if($gift_info['label'] == 2){ //循环开出来的盲盒,相同的礼物只推送一次,消息推送为$FromUserInfo['nickname'] . ' 送给 ' . $ToUserInfo['nickname'].' 趣味礼物 ' .$gift_inf['gift_name'].' x 多少'; if($gift_box){ @@ -709,6 +700,11 @@ class SendGift extends Model 'user_id' => $to_uid, 'gift_price' => $receive_gift_total, ]; + }else{ + $gift_user_data[] = [ + 'user_id' => $to_uid, + 'gift_price' => $receive_gift_total, + ]; } if($room_type == 7){ $reslut = [ @@ -1034,7 +1030,6 @@ class SendGift extends Model ]; } $gift_box[$key]['gift_name'] = $gift_infos['gift_name']; - $gift_infos= []; } // 构建文字消息内容