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

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

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