From c1c0e3ac1484d7a121613f16a9cea35ef3e6a186 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 31 Mar 2021 18:55:36 +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 --- .../Admin/Controller/TimingController.class.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 973e5c144..10a06aadf 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -1621,7 +1621,7 @@ class TimingController extends AdminController { $month_bonus_pool += $value['pay_amount']; - $quarter_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--) { @@ -1649,19 +1649,19 @@ class TimingController extends AdminController { unset($value['year']); unset($value['month']); - $value['quarter_award'] = $value['quarter_bonus_pool']*0.25*($becomeTimeList[$value['game_belong_id']]/$becomeTimeCount); + $value['quarter_award'] = $value['quarter_bonus_pool']*0.25*(($becomeTimeList[$value['game_belong_id']]?$becomeTimeList[$value['game_belong_id']]:0)/$becomeTimeCount); $is_assistant = M("ucenter_member") ->field("sys_ucenter_member.id admin_id,become_time") ->join("left join sys_auth_group_access access on sys_ucenter_member.id = access.uid") ->join("left join sys_auth_group auth on access.group_id=auth.id") - ->where(['title' => ['like', '%助理%'],'sys_ucenter_member.id'=>$becomeTimeList[$value['game_belong_id']]]) + ->where(['title' => ['like', '%助理%'],'sys_ucenter_member.id'=>$value['game_belong_id']]) ->select(); if (!$is_assistant) { - $value['month_award'] = ($value['pay_amount']/$sum_amount)*$value['month_bonus_pool']*0.7*(($becomeTimeList[$value['game_belong_id']]?$becomeTimeList[$value['game_belong_id']]:0)/$becomeTimeCount); + $value['month_award'] = ($value['pay_amount']/$sum_amount)*$value['month_bonus_pool']*0.7; } else { - $value['month_award'] = ($value['pay_amount']/$sum_amount)*$value['month_bonus_pool']*0.05*(($becomeTimeList[$value['game_belong_id']]?$becomeTimeList[$value['game_belong_id']]:0)/$becomeTimeCount); + $value['month_award'] = ($value['pay_amount']/$sum_amount)*$value['month_bonus_pool']*0.05; } $value['month_award'] = round($value['month_award'],2);