From c772aa68541c80e0bc473df4f4387447dcd4461c Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 31 Mar 2021 19:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E6=89=93=E6=AC=BE=E7=B3=BB?= =?UTF-8?q?=E7=BB=9Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/TimingController.class.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 10a06aadf..7d33a23d4 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -1621,22 +1621,22 @@ class TimingController extends AdminController { $month_bonus_pool += $value['pay_amount']; - $quarter_bonus_pool += $value['pay_amount']; - - if ($is_hav) { - for($i = (($value['month']%3)?(($value['month']%3)-1):2); $i > 0; $i--) { - - $date = date("Y-m",strtotime($value['year'].'-'.(($value['month']-$i)>0?($value['month']-$i):($value['month']-$i+12)))); +// if ($is_hav) { +// for($i = (($value['month']%3)?(($value['month']%3)-1):2); $i > 0; $i--) { +// +// $date = date("Y-m",strtotime($value['year'].'-'.(($value['month']-$i)>0?($value['month']-$i):($value['month']-$i+12)))); +// +// } +// } + } - $quarter_bonus_pool += $handleData[$date.$value['game_belong_id'].$value['relation_game_id']]['pay_amount']; - } - } + $last_amount = M("business_affairs_award_pool","tab_")->where(['time'=>['in',$lasttime]])->group("month_bonus_pool")->select(false); - } + $last_amount = M()->table("({$last_amount}) a")->sum("month_bonus_pool"); $month_bonus_pool = $this->businessAffairRatio($month_bonus_pool); - $quarter_bonus_pool = $this->businessAffairRatio($quarter_bonus_pool); + $quarter_bonus_pool = $month_bonus_pool + $last_amount; foreach ($data as $key => $value){