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-05 19:48:27 +08:00
parent 499f9407b6
commit 0d758d8587
2 changed files with 59 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
application/adminapi/controller/Statistical.php
View File

@@ -696,22 +696,22 @@ class Statistical extends adminApi
public function get_claimed_reward_price($stime="",$etime="",$search_user_id=0,$search_gift_bag_id=0){
//获取所有已领取的任务奖励礼包
$where = [];
if(!empty($stime)){
$where['a.createtime'] = ['>=', strtotime($stime)];
}
if(!empty($etime)){
$where['a.createtime'] = ['<=', strtotime($etime)];
}
if(!empty($stime) && !empty($etime)){
$where['a.createtime'] = ['between', [strtotime($stime), strtotime($etime)]];
}
if($search_user_id > 0){
$where['a.user_id'] = $search_user_id;
}
if($search_gift_bag_id > 0){
$where['a.gift_bag_id'] = $search_gift_bag_id;
}
if(!empty($etime) && strtotime($etime)<="1767038400"){//2025-12-30 04:00:00
if(!empty($etime) && strtotime($etime)<="1767114849"){//2025-12-31 01:14:09
if(!empty($stime) && !empty($etime)){
$where['a.createtime'] = ['between', [strtotime($stime), strtotime($etime)]];
}else{
if(!empty($stime)){
$where['a.createtime'] = ['>=', strtotime($stime)];
}elseif(!empty($etime)){
$where['a.createtime'] = ['<=', strtotime($etime)];
}
}
$tasks_bag_details = db::name('vs_gift_bag_receive_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id', 'INNER')
@@ -721,14 +721,45 @@ class Statistical extends adminApi
->where($where)
->select();
}else{
$tasks_bag_details = db::name('vs_gift_bag_receive_tasks_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id', 'INNER')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
->whereBetween('a.gift_bag_id', [18, 51])
->where($where)
->select();
if(!empty($stime) && strtotime($stime)<="1767114849" && strtotime($etime)>"1767114849"){
$old_tasks_bag_details = db::name('vs_gift_bag_receive_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id', 'INNER')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
->whereBetween('a.gift_bag_id', [18, 51])
->whereBetween('a.createtime', [strtotime($stime), 1767114849])
->where($where)
->select();
$new_tasks_bag_details = db::name('vs_gift_bag_receive_tasks_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id', 'INNER')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
->whereBetween('a.gift_bag_id', [18, 51])
->whereBetween('a.createtime', [1767114849, strtotime($etime)])
->where($where)
->select();
$tasks_bag_details = array_merge($old_tasks_bag_details, $new_tasks_bag_details);
}else{
if(!empty($stime) && !empty($etime)){
$where['a.createtime'] = ['between', [strtotime($stime), strtotime($etime)]];
}else{
if(!empty($stime)){
$where['a.createtime'] = ['>=', strtotime($stime)];
}elseif(!empty($etime)){
$where['a.createtime'] = ['<=', strtotime($etime)];
}
}
$tasks_bag_details = db::name('vs_gift_bag_receive_tasks_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id', 'INNER')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
->whereBetween('a.gift_bag_id', [18, 51])
->where($where)
->select();
}
}
$total_reward_price = 0;
// 批量获取礼物价格以减少数据库查询

18
application/cron/controller/Test.php
View File

@@ -968,8 +968,13 @@ class Test
//任务金币统计
public function task_coin_count(){
$stime = "1766937600";
$etime = "1767542400";
// $etime = "2025-12-29 10:30:00";
// $stime = "2025-12-29 00:00:00";
// $etime = "2025-12-30 04:00:00";
$stime = "2025-12-29 00:00:00";
$etime = "2026-01-05 00:00:00";
// $stime = "2025-12-22 00:00:00";
// $etime = "2025-12-29 00:00:00";
//获取所有已领取的任务奖励礼包
$where = [];
if(!empty($stime)){
@@ -981,14 +986,13 @@ class Test
if(!empty($stime) && !empty($etime)){
$where['a.createtime'] = ['between', [strtotime($stime), strtotime($etime)]];
}
if(!empty($stime) && !empty($etime) && $etime<="1767038400"){//2025-12-30 04:00:00
if(!empty($etime) && strtotime($etime)<="1767038400"){//2025-12-30 04:00:00
$tasks_bag_details = db::name('vs_gift_bag_receive_log')
->alias('a')
->join('vs_gift_bag_detail b', 'a.parent_id=b.id')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
->where('a.gift_bag_id','>=',18)
->where('a.gift_bag_id','<=',51)
->whereBetween('a.gift_bag_id', [18, 51])
->where($where)
->select();
}else{
@@ -997,9 +1001,7 @@ class Test
->join('vs_gift_bag_detail b', 'a.parent_id=b.id')
->field('a.createtime,b.type,b.foreign_id,b.quantity,b.gold')
->where(['b.type'=>['in', [1,2]]])
// ->where(['b.type'=>1])
->where('a.gift_bag_id','>=',18)
->where('a.gift_bag_id','<=',51)
->whereBetween('a.gift_bag_id', [18, 51])
->where($where)
->select();
}