Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -65,8 +65,8 @@ class BarRoom extends Model
|
||||
//上麦选择礼物
|
||||
public function join_pit_choose_gift($user_id,$room_id,$gift_id){
|
||||
$pit_gift = db::name('vs_room_bar_pit_gift')->where(['room_id' => $room_id,'user_id' => $user_id])->find();
|
||||
$pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time');
|
||||
$end_time = time()+$pit_time * 60;
|
||||
$pit_time = db::name('vs_room_bar')->where('id',$room_id)->value('pit_time')??5;
|
||||
$end_time = time() + ($pit_time * 60);
|
||||
if($pit_gift){
|
||||
// 使用WHERE条件和影响行数验证确保并发安全
|
||||
$result = db::name('vs_room_bar_pit_gift')
|
||||
|
||||
Reference in New Issue
Block a user