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

bug修改

Browse Source
This commit is contained in:
赵钊
2025-12-23 16:19:57 +08:00
parent 1e02332678
commit 63b64dfb18
4 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
application/adminapi/controller/User.php
View File

@@ -470,13 +470,15 @@ class User extends adminApi
$reslut = DB::name('user')->where('id', $user_id)->update($up_user); $reslut = DB::name('user')->where('id', $user_id)->update($up_user);
} }
if($up_user_data){ if($up_user_data){
$user_auth = DB::name('user_auth')->where('mobile', $user['mobile'])->find(); if(!empty($user['mobile'])){
if($user_auth){ $user_auth = DB::name('user_auth')->where('mobile', $user['mobile'])->find();
$res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data); if($user_auth){
}else{ $res = DB::name('user_auth')->where('mobile', $user['mobile'])->update($up_user_data);
$up_user_data['mobile'] = $user['mobile']; }else{
if($real_name && $card_id){ $up_user_data['mobile'] = $user['mobile'];
$res = DB::name('user_auth')->insert($up_user_data); if($real_name && $card_id){
$res = DB::name('user_auth')->insert($up_user_data);
}
} }
} }
} }

6
application/api/model/BlindBoxTurntableGiftDrawWorldNew.php
View File

@@ -1314,9 +1314,9 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
private function selectGiftFromAvailable(array &$available_gifts, $user_id = 0) private function selectGiftFromAvailable(array &$available_gifts, $user_id = 0)
{ {
// 添加针对特定用户和礼物的概率调整逻辑 // 添加针对特定用户和礼物的概率调整逻辑
$adjusted_gifts = $this->adjustGiftProbabilities($available_gifts, $user_id); // $adjusted_gifts = $this->adjustGiftProbabilities($available_gifts, $user_id);
$remaining = array_sum(array_column($adjusted_gifts, 'remaining_number')); $remaining = array_sum(array_column($available_gifts, 'remaining_number'));
if ($remaining <= 0) { if ($remaining <= 0) {
return null; return null;
} }
@@ -1328,7 +1328,7 @@ class BlindBoxTurntableGiftDrawWorldNew extends Model
$rand_value = mt_rand(1, $remaining); $rand_value = mt_rand(1, $remaining);
$current_sum = 0; $current_sum = 0;
foreach ($adjusted_gifts as $gift) { foreach ($available_gifts as $gift) {
if ($gift['remaining_number'] <= 0) { if ($gift['remaining_number'] <= 0) {
continue; continue;
} }

8
application/api/model/Gift.php
View File

@@ -45,7 +45,7 @@ class Gift extends Model
// if($room_id){ // if($room_id){
// $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable'); // $is_open_blind_box_turntable = Db::name('vs_room')->where(['id'=>$room_id])->value('is_open_blind_box_turntable');
// } // }
$list = $this->field('gid as gift_id,gift_name,base_image,gift_price,icon')->where($map)->where($where)->order('sort asc, gift_price asc')->select(); $list = $this->field('gid as gift_id,gift_name,base_image,gift_price,icon')->where($map)->where($where)->order('sort desc, gift_price asc')->select();
if($label==2){ if($label==2){
$list_data = []; $list_data = [];
foreach ($list as &$v) { foreach ($list as &$v) {
@@ -72,9 +72,9 @@ class Gift extends Model
} }
} }
} }
usort($list_data, function($a, $b) { // usort($list_data, function($a, $b) {
return $a['gift_id'] <=> $b['gift_id']; // return $a['gift_id'] <=> $b['gift_id'];
}); // });
$list = $list_data; $list = $list_data;
} }
if ($label == 13) { // 专属礼物 if ($label == 13) { // 专属礼物

19
application/guildadmin/controller/Room.php
View File

@@ -323,6 +323,8 @@ class Room extends GuildAdmin
$page = input('page', 1); $page = input('page', 1);
$page_limit = input('page_limit', 10); $page_limit = input('page_limit', 10);
$type = input('type', 1);//1:全部流水 2:日流水 3:周流水 4:月流水 $type = input('type', 1);//1:全部流水 2:日流水 3:周流水 4:月流水
$stime = input('stime', '');
$etime = input('etime', '');
if($room_id == ''){ if($room_id == ''){
return V(0,"参数错误"); return V(0,"参数错误");
} }
@@ -348,6 +350,18 @@ class Room extends GuildAdmin
$end_time = time(); $end_time = time();
$where['a.createtime'] = ['between', [$begin_time, $end_time]]; $where['a.createtime'] = ['between', [$begin_time, $end_time]];
} }
if($stime != '' && $etime != ''){
$begin_time = strtotime($stime);
$end_time = strtotime($etime);
$where['a.createtime'] = ['between', [$begin_time, $end_time]];
}elseif($stime != '' && $etime == ''){
$begin_time = strtotime($stime);
$end_time = time();
$where['a.createtime'] = ['between', [$begin_time, $end_time]];
}elseif($etime != '' && $stime == ''){
$end_time = strtotime($etime);
$where['a.createtime'] = ['<=', $etime];
}
$count = db::name('vs_give_gift')->alias('a') $count = db::name('vs_give_gift')->alias('a')
->field('a.id') ->field('a.id')
->join('user b', 'a.user_id = b.id', 'left') ->join('user b', 'a.user_id = b.id', 'left')
@@ -377,6 +391,8 @@ class Room extends GuildAdmin
} }
} }
//幸运流水总计
$total_lucky_coin = db::name('vs_room_luck_value')->alias('a')->where('room_id',$room_id)->where($where)->sum('luck_value');
$return_data = [ $return_data = [
'page' =>$page, 'page' =>$page,
'page_limit' => $page_limit, 'page_limit' => $page_limit,
@@ -387,7 +403,8 @@ class Room extends GuildAdmin
->join('user b', 'a.user_id = b.id', 'left') ->join('user b', 'a.user_id = b.id', 'left')
->where('a.from',2) ->where('a.from',2)
->where('a.from_id',$room_id) ->where('a.from_id',$room_id)
->where($where)->sum('total_price') ->where($where)->sum('total_price'),
'total_lucky_coin' => $total_lucky_coin,
] ]
]; ];
return V(1,"成功", $return_data); return V(1,"成功", $return_data);