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

任务记录统计提交

Browse Source
This commit is contained in:
赵钊
2025-12-30 19:57:54 +08:00
parent 0fe00cf140
commit c0509263d4
2 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -676,21 +676,36 @@ class Statistical extends adminApi
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;
}
$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)
->where($where)
->select();
if(!empty($stime) && !empty($etime) && $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)
->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')
->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)
->where($where)
->select();
}
$total_reward_price = 0;
foreach ($tasks_bag_details as $detail){
if($detail['type'] == 1){

16
application/api/model/Tasks.php
View File

@@ -643,11 +643,12 @@ class Tasks extends Model
}
// 记录日志
//添加礼盒记录
$reslut = Db::name('vs_gift_bag_receive_log')->insert([
$reslut = Db::name('vs_gift_bag_receive_tasks_log')->insert([
'user_id' => $user_id,
'gift_bag_id' => $gift_box_id,
'parent_id' => $v['id'],
'gift_id'=> $v['foreign_id'],
'type' => $v['type'],
'num' => $v['quantity'],
'bag_price' => $gift_box_info['money'],
'gift_price' => $v['gold'],
@@ -816,6 +817,19 @@ class Tasks extends Model
default:
break;
}
// 记录日志
//添加礼盒记录
$reslut = Db::name('vs_gift_bag_receive_tasks_log')->insert([
'user_id' => $user_id,
'gift_bag_id' => 18,
'parent_id' => $v['id'],
'gift_id'=> $v['foreign_id'],
'type' => $v['type'],
'num' => $v['quantity'],
'gift_price' => $v['gold'],
'createtime' => time(),
'updatetime' => time()
]);
}
}
// 提交事务