diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index 43198ef..f18dba7 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -80,11 +80,9 @@ class BlindBoxTurntableGift extends Model return ['code' => 1, 'msg' => '成功', 'data' => null]; } $blind_box_turntable_log = Db::name('vs_blind_box_turntable_results_log')->where(['tid'=>$send_id])->select(); - $room_id = $blind_box_turntable_log['gift_user_room_id']; if(!$blind_box_turntable_log){ return ['code' => 0, 'msg' => '数据不存在','data' => null]; } - $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name'); $FromUserInfo = Db::name('user')->where(['id'=>$blind_box_turntable['user_id']])->find(); $FromUserInfo['user_id'] = $FromUserInfo['id']; $FromUserInfo['icon'][0] = model('UserData')->user_wealth_icon($blind_box_turntable['user_id']);//财富图标 @@ -94,6 +92,8 @@ class BlindBoxTurntableGift extends Model $userGiftMap = []; $ToUserInfo = []; foreach ($blind_box_turntable_log as $key => $value) { + $room_id = $value['gift_user_room_id']; + $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name'); $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find(); $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find(); $text_message = $user_nickname . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $draw_gift['gift_name'] . 'X' . $value['count']."\n"; @@ -114,7 +114,8 @@ class BlindBoxTurntableGift extends Model if (!isset($userGiftMap[$userId])) { $userGiftMap[$userId] = [ 'userInfo' => $ToUserInfo, - 'gifts' => [] + 'gifts' => [], + 'room_id' => $room_id ]; } $userGiftMap[$userId]['gifts'][] = [ @@ -128,6 +129,7 @@ class BlindBoxTurntableGift extends Model // 为每个用户单独推送消息 foreach($userGiftMap as $userId => $userData) { + $room_id = $userData['room_id']; $userInfo = $userData['userInfo']; $gifts = $userData['gifts']; diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php index 06c4965..5a913cd 100644 --- a/application/cron/controller/RoomPan.php +++ b/application/cron/controller/RoomPan.php @@ -30,18 +30,18 @@ class RoomPan * 盲盒转盘礼物推送补发 */ public function blind_box_turntable_gift_send(){ - $blind_box_turntable = Db::name('vs_blind_box_turntable_log')->where(['is_sued'=>0,'createtime'=>['>=',time()-60*30]])->limit(1000)->select(); + $blind_box_turntable = db('vs_blind_box_turntable_log')->where(['is_sued'=>0,'createtime'=>['>=',time()-60*30]])->limit(1000)->select(); if(empty($blind_box_turntable)){ echo "没有需要发放的礼物 \n"; } echo "开始发放".count($blind_box_turntable)." \n"; foreach ($blind_box_turntable as $k => $v) { - $blind_box_turntable_results_log = Db::name('vs_blind_box_turntable_results_log')->where('tid',$v['id'])->select(); + $blind_box_turntable_results_log = db('vs_blind_box_turntable_results_log')->where('tid',$v['id'])->select(); if(empty($blind_box_turntable_results_log)){ echo $v['id']." 没有需要发放的礼物 \n"; continue; } - $room_id = $blind_box_turntable_results_log['gift_user_room_id']; + $room_id = $v['room_id']; $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name'); $FromUserInfo = Db::name('user')->where(['id'=>$v['user_id']])->find(); $FromUserInfo['user_id'] = $FromUserInfo['id']; @@ -51,6 +51,8 @@ class RoomPan $user_nickname = $FromUserInfo['nickname']; $userGiftMap = []; foreach ($blind_box_turntable_results_log as $key => $value) { + $room_id = $value['gift_user_room_id']; + $room_name = Db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->value('room_name'); $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find(); $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find(); $text_message = $user_nickname . '在' . $room_name . '房间送给了' . $ToUserInfo['nickname'] . $draw_gift['gift_name'] . 'X' . $value['count']."\n"; @@ -71,7 +73,8 @@ class RoomPan if (!isset($userGiftMap[$userId])) { $userGiftMap[$userId] = [ 'userInfo' => $ToUserInfo, - 'gifts' => [] + 'gifts' => [], + 'room_id' => $room_id ]; } $userGiftMap[$userId]['gifts'][] = [ @@ -85,6 +88,7 @@ class RoomPan // 为每个用户单独推送消息 foreach($userGiftMap as $userId => $userData) { + $room_id = $userData['room_id']; $userInfo = $userData['userInfo']; $gifts = $userData['gifts'];