From 0211b84268a12a0b618e55f98533d5e5eaa9dc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Tue, 16 Sep 2025 20:23:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=BD=AC=E7=9B=98bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=90=8E=E5=8F=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/BlindBox.php | 21 ++++++++++++------- .../api/model/BlindBoxTurntableGift.php | 11 ++++++++-- application/cron/controller/RoomPan.php | 10 ++++++++- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php index 6a03da2..af55828 100644 --- a/application/adminapi/controller/BlindBox.php +++ b/application/adminapi/controller/BlindBox.php @@ -769,19 +769,24 @@ class BlindBox extends adminApi if($room){ $lists[$key]['room_name'] = $room['room_number']."-".$room['room_name']; } - $lists[$key]['bag_price'] = $value['bag_price']; + $lists[$key]['bag_price'] = $value['bag_price']*$value['num']; $lists[$key]['gift_id'] = $value['gift_id']; $lists[$key]['gift_name'] = db::name('vs_gift')->where('gid',$value['gift_id'])->value('gift_name'); $lists[$key]['gift_price'] = $value['gift_price']; $lists[$key]['gift_num'] = $value['num']; $lists[$key]['createtime'] = date('Y-m-d H:i:s',$value['createtime']); } - //总抽奖次数 - $total = $count; + $all_lists_data = db::name('vs_gift_bag_receive_log')->where($where)->order("id desc")->select(); + $total =0; + $total_gift_money = 0; + foreach ($all_lists_data as $key => $value) { + $total += $value['num']; + $total_gift_money += $value['gift_price'] * $value['num']; + } + //总抽奖次数 $total //总抽奖金额（支出） $total_money = db::name('vs_gift_bag_receive_log')->where($where)->sum('bag_price'); - //总礼物价值（收入） - $total_gift_money = db::name('vs_gift_bag_receive_log')->where($where)->sum('gift_price'); + //总礼物价值（收入） $total_gift_money //统计 if($total_gift_money==0 || $total_money==0){ $ratio = 0; @@ -863,12 +868,14 @@ class BlindBox extends adminApi $lists[$key]['createtime'] = date('Y-m-d H:i:s',$value['createtime']); } //今日锁定礼物数量 + $today = strtotime(date('Y-m-d')); + $locking_num = db::name('vs_room_pan_xlh_log')->where('createtime','>=',$today)->count(); $return_data = [ 'page' =>$page, 'page_limit' => $page_limit, - 'count' => count($lists_data), + 'count' => $count, 'lists' => $lists, - 'locking_num' => $count + 'locking_num' => $locking_num ]; return V(1,"成功", $return_data); } diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index affefd5..e860663 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -642,7 +642,10 @@ class BlindBoxTurntableGift extends Model $textMessage = $user_nickname; $text_message = []; foreach ($blind_box_turntable_log as $key => $value) { - $ToUserInfo = Db::name('user')->where(['id'=>$value['gift_user_id']])->find(); + $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find(); + $ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标 + $ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标 + $ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力 $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find(); $textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n"; $play_image[] = $draw_gift['play_image']; @@ -660,11 +663,15 @@ class BlindBoxTurntableGift extends Model 'number' => $value['count'], ]; } + $ToUserInfosList[$value['gift_user_id']] = $ToUserInfo; - + } + foreach($ToUserInfosList as $userInfo) { + $ToUserInfos[] = $userInfo; } $text = [ 'FromUserInfo' => $FromUserInfo, + 'ToUserInfos' => $ToUserInfos, 'GiftInfo' => [ 'play_image' => implode(',',$play_image), ], diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php index 759669d..be59e08 100644 --- a/application/cron/controller/RoomPan.php +++ b/application/cron/controller/RoomPan.php @@ -47,7 +47,10 @@ class RoomPan $textMessage = $user_nickname; $text_message = $user_nickname; foreach ($blind_box_turntable_results_log as $key => $value) { - $ToUserInfo = Db::name('user')->where(['id'=>$value['gift_user_id']])->find(); + $ToUserInfo = Db::name('user')->where(['id' => $value['gift_user_id']])->field('id as user_id,nickname,avatar,sex')->find(); + $ToUserInfo['icon'][0] = model('UserData')->user_wealth_icon($value['gift_user_id']);//财富图标 + $ToUserInfo['icon'][1] = model('UserData')->user_charm_icon($value['gift_user_id']);//魅力图标 + $ToUserInfo['charm'] = db::name('vs_room_user_charm')->where(['user_id' => $value['gift_user_id'],'room_id' => $room_id])->value('charm');//魅力 $draw_gift = Db::name('vs_gift')->where(['gid'=>$value['gift_id']])->find(); $textMessage = $textMessage . ' 送给 ' . $ToUserInfo['nickname']. ' 盲盒转盘礼物 ' . $draw_gift['gift_name'].' x ' .$value['count']."\n"; $play_image[] = $draw_gift['play_image']; @@ -65,9 +68,14 @@ class RoomPan 'number' => $value['count'], ]; } + $ToUserInfosList[$value['gift_user_id']] = $ToUserInfo; + } + foreach($ToUserInfosList as $userInfo) { + $ToUserInfos[] = $userInfo; } $text = [ 'FromUserInfo' => $FromUserInfo, + 'ToUserInfos' => $ToUserInfos, 'GiftInfo' => [ 'play_image' => implode(',',$play_image), ],