From b0b6ef72a55f4c305f0ed142a24e1460a1c72a15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Fri, 16 Jan 2026 09:07:31 +0800 Subject: [PATCH] =?UTF-8?q?bug=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Xxiaoshi.php | 82 +------------------------ application/api/model/BarRoom.php | 10 ++- application/api/model/Decorate.php | 2 +- application/api/model/Family.php | 18 +++--- application/api/model/GiftNew.php | 2 +- application/api/model/Guild.php | 2 +- application/api/model/Room.php | 2 +- application/api/model/SendGift.php | 22 ++++--- application/api/model/Sign.php | 2 +- application/api/model/Tasks.php | 2 +- 10 files changed, 32 insertions(+), 112 deletions(-) diff --git a/application/api/controller/Xxiaoshi.php b/application/api/controller/Xxiaoshi.php index 68967206..df78a1a9 100644 --- a/application/api/controller/Xxiaoshi.php +++ b/application/api/controller/Xxiaoshi.php @@ -50,85 +50,5 @@ class Xxiaoshi extends Controllers } - //拆分钱包表 - public function splitWallet() - { - $res = db::name('user_wallet')->field('user_id,coin,earnings,createtime')->select(); - - $coin_data = []; - $earnings_data = []; - $i = 0; - if($res){ - - foreach ($res as $v){ - $coin_data[] = [ - 'user_id' => $v['user_id'], - 'coin' => $v['coin'], - 'createtime' => $v['createtime'], - ]; - $earnings_data[] = [ - 'user_id' => $v['user_id'], - 'earnings' => $v['earnings'], - 'createtime' => $v['createtime'], - ]; - $i++; - } - $res = db::name('user_wallet_coin')->insertAll($coin_data); - $res1 = db::name('user_wallet_earnings')->insertAll($earnings_data); - echo $i.'条数据成功插入'.$res.'===='.$res1; - } - } - - - //拆分流水表 - public function splitFlow() - { - $page = input('page'); - if(!$page){ - echo '请输入页数';exit; - } - $res = db::name('vs_user_money_log')->where('exp',0) - ->field('log_id,user_id,room_id,change_type,money_type,change_value,from_id,remarks,createtime') - ->page($page,10000) -// ->where(['createtime'=> ['>=', 1765728000]]) - ->select(); - - $i = 0; - if($res){ - foreach ($res as $k => $v){ - $coin_data = []; - $ear_data = []; - - if($v['money_type'] ==1){ - $coin_data = [ - 'user_id' => $v['user_id'], - 'room_id' => $v['from_id'], - 'coin' => $v['change_value'], - 'before' => $v['change_value'], - 'after' => $v['change_value'], - 'change_type' => $v['change_type'], - 'remarks' => $v['remarks'], - ]; - } - if($v['money_type'] ==2){ - $ear_data = [ - 'user_id' => $v['user_id'], - 'room_id' => $v['from_id'], - 'earnings' => $v['change_value'], - 'before' => $v['change_value'], - 'after' => $v['change_value'], - 'remarks' => $v['remarks'], - 'change_type' => $v['change_type'], - ]; - } - $res = db::name('user_coin_log')->insert($coin_data); - $res1 = db::name('user_earnings_log')->insert($ear_data); - db::name('vs_user_money_log')->where('log_id',$v['log_id'])->update(['exp'=>1]); - $i ++; - } - - echo $i.'条数据成功插入'; - } - } - + } \ No newline at end of file diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php index cf22be5b..68147d87 100644 --- a/application/api/model/BarRoom.php +++ b/application/api/model/BarRoom.php @@ -195,13 +195,11 @@ class BarRoom extends Model } //预测版块 上线前注释掉 ======👇====== - if (\think\Env::get('app.system_type','prod') != "prod") { //获取 房间ID - $room_last_id = db::name('vs_room')->order('id desc')->value('id'); - if ($room_last_id >= 19998) { - return ['code' => 0, 'msg' => '房间已满，暂时不能创建房间，请联系运营或管理', 'data' => null]; - } - } + // $room_last_id = db::name('vs_room')->order('id desc')->value('id'); + // if($room_last_id >= 19998){ + // return ['code' => 0, 'msg' =>'房间已满，暂时不能创建房间，请联系运营或管理', 'data' => null]; + // } //预测版块 上线前注释掉======👆====== diff --git a/application/api/model/Decorate.php b/application/api/model/Decorate.php index 20e8ce46..2b267aee 100644 --- a/application/api/model/Decorate.php +++ b/application/api/model/Decorate.php @@ -309,7 +309,7 @@ class Decorate extends Model }catch (\Exception $e) { // 回滚事务 Db::rollback(); - return ['code' => 0, 'msg' => "请重试", 'data' => null]; + return ['code' => 0, 'msg' => "请重试".$e->getMessage(), 'data' => null]; } } diff --git a/application/api/model/Family.php b/application/api/model/Family.php index 7c0c5665..edc9d133 100644 --- a/application/api/model/Family.php +++ b/application/api/model/Family.php @@ -121,22 +121,22 @@ class Family extends Model // 优化今日收益计算逻辑 $todayStart = strtotime(date('Y-m-d')); if($v['createtime'] < $todayStart){ - $lists[$k]['today_earnings'] = round(db::name('vs_user_money_log') - ->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[$todayStart,time()]]]) - ->sum('change_value'), 4);//今日收益 + $lists[$k]['today_earnings'] = round(db::name('user_earnings_log') + ->where(['user_id' => $v['user_id'],'change_type' =>11,'createtime' => ['between',[$todayStart,time()]]]) + ->sum('earnings'), 4);//今日收益 }else{ - $lists[$k]['today_earnings'] = round(db::name('vs_user_money_log') - ->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[$v['createtime'],time()]]]) - ->sum('change_value'), 4);//今日收益 + $lists[$k]['today_earnings'] = round(db::name('user_earnings_log') + ->where(['user_id' => $v['user_id'],'change_type' =>11,'createtime' => ['between',[$v['createtime'],time()]]]) + ->sum('earnings'), 4);//今日收益 } // 昨日收益计算逻辑优化 $yesterdayStart = strtotime(date('Y-m-d', strtotime('-1 day'))); $yesterdayEnd = strtotime(date('Y-m-d')); if($v['createtime'] <= $todayStart) { - $lists[$k]['yesterday_earnings'] = round(db::name('vs_user_money_log') - ->where(['user_id' => $v['user_id'], 'money_type' => 2, 'change_type' => 11, 'createtime' => ['between', [$yesterdayStart, $yesterdayEnd]]]) - ->sum('change_value'), 4); + $lists[$k]['yesterday_earnings'] = round(db::name('user_earnings_log') + ->where(['user_id' => $v['user_id'], 'change_type' => 11, 'createtime' => ['between', [$yesterdayStart, $yesterdayEnd]]]) + ->sum('earnings'), 4); }else{ $lists[$k]['yesterday_earnings'] = 0; } diff --git a/application/api/model/GiftNew.php b/application/api/model/GiftNew.php index 0ec774f2..e9143a27 100644 --- a/application/api/model/GiftNew.php +++ b/application/api/model/GiftNew.php @@ -151,7 +151,7 @@ class GiftNew extends Model $type = 1; } - if(!$room_id){ //临时补贴iOS没有传此值 + if(!$room_id){ $room_id = db::name('vs_room_visitor')->where(['user_id' => $user_id])->order('id desc')->value('room_id'); } diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index 4f0677c3..ee7ddbd2 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -373,7 +373,7 @@ class Guild extends Model //退出公会 public function quit_guild($uid, $guild_id,$type){ - //去除字符里的g + //去除字符里的g $guild_id = str_replace('g', '', $guild_id); $guild_id = intval($guild_id); $config = get_system_config(); diff --git a/application/api/model/Room.php b/application/api/model/Room.php index d881e463..9db597c2 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -2652,7 +2652,7 @@ class Room extends Model $v['icon'][2] = db::name('vs_singer_level')->where(['level' => $isSinger['level'],'deletetime' => 0])->value('image');//等级图标 } - $v['earnings'] = db::name('vs_user_money_log')->where(['user_id' => $v['user_id'],'room_id' => $room_id,'money_type' => 2,'change_type' => 19])->sum('change_value'); + $v['earnings'] = db::name('user_earnings_log')->where(['user_id' => $v['user_id'],'room_id' => $room_id,'change_type' => 19])->sum('earnings'); } } return ['code' => 1, 'msg' => '成功', 'data' => $list]; diff --git a/application/api/model/SendGift.php b/application/api/model/SendGift.php index 458b8a3c..c73e3f62 100644 --- a/application/api/model/SendGift.php +++ b/application/api/model/SendGift.php @@ -130,7 +130,7 @@ class SendGift extends Model $host_id = Db::name('vs_room_pit')->where(['room_id'=>$p_room_id,'pit_number'=>9])->value('user_id'); if($host_id){ //计算主持人收益 - $ratio = db::name('vs_room_host')->where(['room_id'=>$p_room_id,'user_id'=>$to_uid,'delete_time'=>null,'type'=>1])->value('ratio'); + $ratio = db::name('vs_room_host')->where(['room_id'=>$p_room_id,'user_id'=>$host_id,'delete_time'=>null,'type'=>1])->value('ratio'); if(!$ratio){ $ratio = 0; } @@ -382,7 +382,7 @@ class SendGift extends Model $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id'); if($host_id){ //计算主持人收益 - $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$to_uid,'delete_time'=>null,'type'=>1])->value('ratio'); + $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$host_id,'delete_time'=>null,'type'=>1])->value('ratio'); if(!$ratio){ $ratio = 0; } @@ -553,17 +553,17 @@ class SendGift extends Model // 统计相同礼物的数量 $giftCount = []; foreach ($gift_box as $key=>$gv) { - $gift_info = Db::name('vs_gift')->where(['gid'=>$gv['gift_id']]) + $gift_infos = Db::name('vs_gift')->where(['gid'=>$gv['gift_id']]) ->field('gid as gift_id,gift_name,gift_price,file_type,base_image,play_image,gift_type,label,is_public_server')->find(); if (isset($giftCount[$gv['gift_id']])) { $giftCount[$gv['gift_id']]['count']++; } else { $giftCount[$gv['gift_id']] = [ - 'gift_info' => $gift_info, + 'gift_info' => $gift_infos, 'count' => 1 ]; } - $gift_box[$key]['gift_name'] = $gift_info['gift_name']; + $gift_box[$key]['gift_name'] = $gift_infos['gift_name']; } // 构建文字消息内容 @@ -880,7 +880,7 @@ class SendGift extends Model $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id'); if($host_id){ //计算主持人收益 - $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$to_uid,'delete_time'=>null,'type'=>1])->value('ratio'); + $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$host_id,'delete_time'=>null,'type'=>1])->value('ratio'); if(!$ratio){ $ratio = 0; } @@ -1023,17 +1023,18 @@ class SendGift extends Model // 统计相同礼物的数量 $giftCount = []; foreach ($gift_box as $key=>$gv) { - $gift_info = Db::name('vs_gift')->where(['gid'=>$gv['gift_id']]) + $gift_infos = Db::name('vs_gift')->where(['gid'=>$gv['gift_id']]) ->field('gid as gift_id,gift_name,gift_price,file_type,base_image,play_image,gift_type,label,is_public_server')->find(); if (isset($giftCount[$gv['gift_id']])) { $giftCount[$gv['gift_id']]['count']++; } else { $giftCount[$gv['gift_id']] = [ - 'gift_info' => $gift_info, + 'gift_info' => $gift_infos, 'count' => 1 ]; } - $gift_box[$key]['gift_name'] = $gift_info['gift_name']; + $gift_box[$key]['gift_name'] = $gift_infos['gift_name']; + $gift_infos= []; } // 构建文字消息内容 @@ -1092,6 +1093,7 @@ class SendGift extends Model } } } + }else{ if($gift_info['label'] == 17) { $label_text .= $FromUserInfo['nickname'] . ' 送给 ' . $ToUserInfo['nickname'] . ' 礼物 ' . $gift_info['gift_name'] . ' x ' . $num . "\n"; @@ -1210,7 +1212,7 @@ class SendGift extends Model $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id'); if($host_id){ //计算主持人收益 - $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$to_uid,'delete_time'=>null,'type'=>1])->value('ratio'); + $ratio = db::name('vs_room_host')->where(['room_id'=>$room_id,'user_id'=>$host_id,'delete_time'=>null,'type'=>1])->value('ratio'); if(!$ratio){ $ratio = 0; } diff --git a/application/api/model/Sign.php b/application/api/model/Sign.php index b0e8e3f2..622c6e38 100644 --- a/application/api/model/Sign.php +++ b/application/api/model/Sign.php @@ -684,7 +684,7 @@ class Sign extends Model //获取签约者的金币 - $coin = db::name('user_wallet')->where('user_id',$user_id)->value('coin'); + $coin = db::name('user_wallet_coin')->where('user_id',$user_id)->value('coin'); if($coin < $change_coin){ return ['code' => 0, 'msg' => '您的金币不足', 'data' => null]; } diff --git a/application/api/model/Tasks.php b/application/api/model/Tasks.php index f8927aa6..8a8915ca 100644 --- a/application/api/model/Tasks.php +++ b/application/api/model/Tasks.php @@ -56,7 +56,7 @@ class Tasks extends Model public function dailyTasksList($user_id=''){ $reslut = []; //用户今日充值金币数量 - $user_gold = Db::name('user_coin_log')->where(['user_id'=>$user_id,'change_type'=>2]) + $user_gold = Db::name('user_coin_log')->where(['user_id'=>$user_id,'change_type'=>2]) ->whereTime('createtime', 'today') ->sum('coin'); $reslut['user_gold'] = $user_gold ? $user_gold : 0;