Merge pull request '财务打款系统bug修复' (#262) from feature/add_item into release

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/262

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);