新需求:PK任务 提交
This commit is contained in:
@@ -4,6 +4,7 @@ namespace app\adminapi\controller;
|
||||
|
||||
use app\admin\model\AdminLog;
|
||||
use app\common\controller\adminApi;
|
||||
use app\common\library\GiftTableManager;
|
||||
use think\Config;
|
||||
use think\Db;
|
||||
use think\Hook;
|
||||
@@ -162,11 +163,19 @@ class Index extends adminApi
|
||||
$day_time_end = strtotime(date('Y-m-') . $i . ' 23:59:59');
|
||||
$gift_money[$i]['time'] = date('Y-m-') . $i;
|
||||
//总礼物打赏值
|
||||
$gift_money[$i]['gift_total_day'] = Db::name('vs_give_gift')->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
$tables = GiftTableManager::getTablesByTimeRange(
|
||||
$day_time,
|
||||
$day_time_end
|
||||
);
|
||||
$table_name = $tables[0];
|
||||
//表前缀
|
||||
$table_prefix = config('database.prefix');
|
||||
$table_name = str_replace($table_prefix, '', $table_name);
|
||||
$gift_money[$i]['gift_total_day'] = Db::name($table_name)->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
//购买礼物打赏价值
|
||||
$gift_money[$i]['gift_buy_day'] = Db::name('vs_give_gift')->where('type',1)->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
$gift_money[$i]['gift_buy_day'] = Db::name($table_name)->where('type',1)->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
//背包礼物打赏价值
|
||||
$gift_money[$i]['gift_backpack_day'] = Db::name('vs_give_gift')->where('type',2)->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
$gift_money[$i]['gift_backpack_day'] = Db::name($table_name)->where('type',2)->where('createtime', 'between', [$day_time, $day_time_end])->sum('total_price');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -491,7 +491,7 @@ class Tasks extends Model
|
||||
//本次是否获胜
|
||||
$ext = 0;
|
||||
if ($user_daily_tasks) {
|
||||
if(in_array($user_id,$Victory_user_ids)){
|
||||
if(!empty($Victory_user_ids) && in_array($user_id,$Victory_user_ids)){
|
||||
//获胜数加1
|
||||
$ext = $user_daily_tasks['ext'] + 1;
|
||||
}
|
||||
@@ -511,7 +511,7 @@ class Tasks extends Model
|
||||
'updatetime' => time(),
|
||||
]);
|
||||
}else{
|
||||
if(in_array($user_id,$Victory_user_ids)){
|
||||
if(!empty($Victory_user_ids) && in_array($user_id,$Victory_user_ids)){
|
||||
$ext = 1;
|
||||
}
|
||||
$insert_data[] = [
|
||||
|
||||
Reference in New Issue
Block a user