From 59ec6c28ca48e4db40c5328017d08bded17ad4d9 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Thu, 26 Nov 2020 18:26:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E4=B8=9A=E7=BB=A9bug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/TimingController.class.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index de080719f..e2d08f314 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -1199,7 +1199,7 @@ class TimingController extends AdminController { ->join("left join tab_promote_company company on promote.company_id = company.id") ->join("left join ({$data}) auth on auth.uid=market_admin_id") ->where(['develop_type'=>['egt',1],'group_id'=>['in',['11','12','21']]]) -// ->where(['company_id'=>278,'spend.promote_id'=>3917,'relation_game_id'=>213]) +// ->where(['company_id'=>43,'spend.promote_id'=>1498,'relation_game_id'=>191]) // ->order("is_settlement ASC") ->select(); @@ -1235,6 +1235,8 @@ class TimingController extends AdminController { ->order("begin_time ASC") ->select(); +// dump($company_belong_game); + $promote_data[$key]['promote_amount'] = 0; foreach ($company_belong_game as $ck => $cv) { @@ -1294,10 +1296,10 @@ class TimingController extends AdminController { } - if ($ck > 1) { -// echo 3; - if (($cv['begin_time'] - $company_belong_game[$ck-1]['end_time'] + 86399) > 1) { + if ($ck > 0) { + if (($cv['begin_time'] - $company_belong_game[$ck-1]['end_time'] + 86399) > 1) { +// echo 3; $promote_data[$key]['promote_amount'] += $this->getCompanyGameRadio($value['admin_id'],$value['promote_id'],$value['company_id'],$value['relation_game_id'],$company_belong_game[$ck-1]['end_time'] + 86400,$cv['begin_time']-1,$value['pay_amount']); } }