MIDI/midi-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-09-09 16:38:56 +08:00
parent f6abe72cb6 66aee47ba3
commit e278abdf75
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/controller/Room.php
View File

@@ -149,6 +149,8 @@ class Room extends BaseCom
//直播间送礼 //直播间送礼
public function room_give_gift() public function room_give_gift()
{ {
$key_name = "api:room:gift:" . $this->uid;
redis_lock_exit($key_name);
$room_id = input('room_id', 0); $room_id = input('room_id', 0);
$gift_id = input('gift_id', 0); $gift_id = input('gift_id', 0);
$gift_num = input('gift_num', 0); $gift_num = input('gift_num', 0);
@@ -158,6 +160,7 @@ class Room extends BaseCom
$heart_id = input('heart_id', 0); $heart_id = input('heart_id', 0);
$reslut = model('Room')->room_gift($this->uid, $to_uid, $gift_id, $gift_num, $type, $room_id, $pit_number,$heart_id); $reslut = model('Room')->room_gift($this->uid, $to_uid, $gift_id, $gift_num, $type, $room_id, $pit_number,$heart_id);
redis_unlock($key_name);
return V($reslut['code'], $reslut['msg'], $reslut['data']); return V($reslut['code'], $reslut['msg'], $reslut['data']);
} }

16
application/api/model/GiveGift.php
View File

@@ -575,13 +575,19 @@ class GiveGift extends Model
//增加房间火热值hot_value //增加房间火热值hot_value
$gift_totalaa = $gift_total * get_system_config_value('coin_charm_exp'); $gift_totalaa = $gift_total * get_system_config_value('coin_charm_exp');
Db::name('vs_room') // Db::name('vs_room')
->where(['id' => $from_id, 'apply_status' => 2]) // ->where(['id' => $from_id, 'apply_status' => 2])
->inc('hot_value', $gift_totalaa) // ->inc('hot_value', $gift_totalaa)
->inc('today_hot_value', $gift_totalaa) // ->inc('today_hot_value', $gift_totalaa)
->update(); // ->update();
// Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('hot_value',$gift_totalaa); // Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('hot_value',$gift_totalaa);
// Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('today_hot_value',$gift_totalaa); // Db::name('vs_room')->where(['id'=>$from_id,'apply_status'=>2])->setInc('today_hot_value',$gift_totalaa);
$hot_value = db::name('vs_room')->where('id', $from_id)->field('id,hot_value,today_hot_value')->find();
if($hot_value){
$hhot_value = $hot_value['hot_value'] + $gift_totalaa;
$today_hot_value = $hot_value['today_hot_value'] + $gift_totalaa;
db::name('vs_room')->where('id', $hot_value['id'])->update(['hot_value' =>$hhot_value,'today_hot_value'=>$today_hot_value]);
}
$roomtype = Db::name('vs_room')->where(['id' => $from_id])->value('type_id'); $roomtype = Db::name('vs_room')->where(['id' => $from_id])->value('type_id');
if($roomtype == 6){ if($roomtype == 6){