Merge remote-tracking branch 'origin/feature/admin_optimize' into feature/admin_optimize

Application/Admin/Controller/StatementController.class.php

@@ -83,7 +83,7 @@ class StatementController extends ThinkController
         $CompanyId = $_REQUEST['company_id']; //对账公司id
         $statement_type = $_REQUEST['statement_type'];
         
-        $is_month = false;//是否是月结判断
+        $is_month = false;//是否是月结判断，非月结无需梯度计算
         if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) {
             //判断是否是月结
             $tm = explode('-',$_REQUEST['time_start']);
@@ -154,15 +154,16 @@ class StatementController extends ThinkController
                 "game_id"=>$v['game_id'],
                 "begin_total_amount"=>0,
             );
-            if($is_month){
-                $map['begin_total_amount'] = array("ELT",$v['pay_amount']);
-            };
-            $ratiores =  $CpGameRatio->where($map)->order("begin_total_amount desc")->limit(1)->select();
-            if(empty($ratiores)){
-                $redio = 0;
-            }else{
-                $redio = $ratiores[0]['ratio'];
-            }
+            // if($is_month){
+            //     $map['begin_total_amount'] = array("ELT",$v['pay_amount']);
+            // };
+            // $ratiores =  $CpGameRatio->where($map)->order("begin_total_amount desc")->limit(1)->select();
+            // if(empty($ratiores)){
+            //     $redio = 0;
+            // }else{
+            //     $redio = $ratiores[0]['ratio'];
+            // }
+            $redio = getGameCpRadio($v['game_id'],$v['pay_amount'],$is_month);//获取分成比例
             $v['second_ratio'] = $redio;
             $v['first_ratio'] = (100-$redio);
             if($statement_type == 0){