YUSHENG/yusheng-php
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug 修改

Browse Source
This commit is contained in:
刘华清
2026-01-16 09:07:31 +08:00
parent 9bec4ef093
commit b0b6ef72a5
10 changed files with 32 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
application/api/controller/Xxiaoshi.php
View File

@@ -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.'条数据成功插入';
}
}
} }

10
application/api/model/BarRoom.php
View File

@@ -195,13 +195,11 @@ class BarRoom extends Model
} }
//预测版块 上线前注释掉 ======👇====== //预测版块 上线前注释掉 ======👇======
if (\think\Env::get('app.system_type','prod') != "prod") {
//获取 房间ID //获取 房间ID
$room_last_id = db::name('vs_room')->order('id desc')->value('id'); // $room_last_id = db::name('vs_room')->order('id desc')->value('id');
if ($room_last_id >= 19998) { // if($room_last_id >= 19998){
return ['code' => 0, 'msg' => '房间已满，暂时不能创建房间，请联系运营或管理', 'data' => null]; // return ['code' => 0, 'msg' =>'房间已满，暂时不能创建房间，请联系运营或管理', 'data' => null];
} // }
}
//预测版块 上线前注释掉======👆====== //预测版块 上线前注释掉======👆======

2
application/api/model/Decorate.php
View File

@@ -309,7 +309,7 @@ class Decorate extends Model
}catch (\Exception $e) { }catch (\Exception $e) {
// 回滚事务 // 回滚事务
Db::rollback(); Db::rollback();
return ['code' => 0, 'msg' => "请重试", 'data' => null]; return ['code' => 0, 'msg' => "请重试".$e->getMessage(), 'data' => null];
} }
} }

18
application/api/model/Family.php
View File

@@ -121,22 +121,22 @@ class Family extends Model
// 优化今日收益计算逻辑 // 优化今日收益计算逻辑
$todayStart = strtotime(date('Y-m-d')); $todayStart = strtotime(date('Y-m-d'));
if($v['createtime'] < $todayStart){ if($v['createtime'] < $todayStart){
$lists[$k]['today_earnings'] = round(db::name('vs_user_money_log') $lists[$k]['today_earnings'] = round(db::name('user_earnings_log')
->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[$todayStart,time()]]]) ->where(['user_id' => $v['user_id'],'change_type' =>11,'createtime' => ['between',[$todayStart,time()]]])
->sum('change_value'), 4);//今日收益 ->sum('earnings'), 4);//今日收益
}else{ }else{
$lists[$k]['today_earnings'] = round(db::name('vs_user_money_log') $lists[$k]['today_earnings'] = round(db::name('user_earnings_log')
->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[$v['createtime'],time()]]]) ->where(['user_id' => $v['user_id'],'change_type' =>11,'createtime' => ['between',[$v['createtime'],time()]]])
->sum('change_value'), 4);//今日收益 ->sum('earnings'), 4);//今日收益
} }
// 昨日收益计算逻辑优化 // 昨日收益计算逻辑优化
$yesterdayStart = strtotime(date('Y-m-d', strtotime('-1 day'))); $yesterdayStart = strtotime(date('Y-m-d', strtotime('-1 day')));
$yesterdayEnd = strtotime(date('Y-m-d')); $yesterdayEnd = strtotime(date('Y-m-d'));
if($v['createtime'] <= $todayStart) { if($v['createtime'] <= $todayStart) {
$lists[$k]['yesterday_earnings'] = round(db::name('vs_user_money_log') $lists[$k]['yesterday_earnings'] = round(db::name('user_earnings_log')
->where(['user_id' => $v['user_id'], 'money_type' => 2, 'change_type' => 11, 'createtime' => ['between', [$yesterdayStart, $yesterdayEnd]]]) ->where(['user_id' => $v['user_id'], 'change_type' => 11, 'createtime' => ['between', [$yesterdayStart, $yesterdayEnd]]])
->sum('change_value'), 4); ->sum('earnings'), 4);
}else{ }else{
$lists[$k]['yesterday_earnings'] = 0; $lists[$k]['yesterday_earnings'] = 0;
} }

2
application/api/model/GiftNew.php
View File

@@ -151,7 +151,7 @@ class GiftNew extends Model
$type = 1; $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'); $room_id = db::name('vs_room_visitor')->where(['user_id' => $user_id])->order('id desc')->value('room_id');
} }

2
application/api/model/Room.php
View File

@@ -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['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]; return ['code' => 1, 'msg' => '成功', 'data' => $list];

22
application/api/model/SendGift.php
View File

@@ -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'); $host_id = Db::name('vs_room_pit')->where(['room_id'=>$p_room_id,'pit_number'=>9])->value('user_id');
if($host_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){ if(!$ratio){
$ratio = 0; $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'); $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id');
if($host_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){ if(!$ratio){
$ratio = 0; $ratio = 0;
} }
@@ -553,17 +553,17 @@ class SendGift extends Model
// 统计相同礼物的数量 // 统计相同礼物的数量
$giftCount = []; $giftCount = [];
foreach ($gift_box as $key=>$gv) { 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(); ->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']])) { if (isset($giftCount[$gv['gift_id']])) {
$giftCount[$gv['gift_id']]['count']++; $giftCount[$gv['gift_id']]['count']++;
} else { } else {
$giftCount[$gv['gift_id']] = [ $giftCount[$gv['gift_id']] = [
'gift_info' => $gift_info, 'gift_info' => $gift_infos,
'count' => 1 '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'); $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id');
if($host_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){ if(!$ratio){
$ratio = 0; $ratio = 0;
} }
@@ -1023,17 +1023,18 @@ class SendGift extends Model
// 统计相同礼物的数量 // 统计相同礼物的数量
$giftCount = []; $giftCount = [];
foreach ($gift_box as $key=>$gv) { 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(); ->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']])) { if (isset($giftCount[$gv['gift_id']])) {
$giftCount[$gv['gift_id']]['count']++; $giftCount[$gv['gift_id']]['count']++;
} else { } else {
$giftCount[$gv['gift_id']] = [ $giftCount[$gv['gift_id']] = [
'gift_info' => $gift_info, 'gift_info' => $gift_infos,
'count' => 1 '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{ }else{
if($gift_info['label'] == 17) { if($gift_info['label'] == 17) {
$label_text .= $FromUserInfo['nickname'] . ' 送给 ' . $ToUserInfo['nickname'] . ' 礼物 ' . $gift_info['gift_name'] . ' x ' . $num . "\n"; $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'); $host_id = Db::name('vs_room_pit')->where(['room_id'=>$room_id,'pit_number'=>9])->value('user_id');
if($host_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){ if(!$ratio){
$ratio = 0; $ratio = 0;
} }

2
application/api/model/Sign.php
View File

@@ -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){ if($coin < $change_coin){
return ['code' => 0, 'msg' => '您的金币不足', 'data' => null]; return ['code' => 0, 'msg' => '您的金币不足', 'data' => null];
} }