Merge branch 'hotfix/market_percentage' of wmtx/platform into release

特殊比例功能修正

Application/Admin/Controller/CompanyGameRatioController.class.php

@@ -423,7 +423,7 @@ class CompanyGameRatioController extends AdminController
             $v['verify_log']['admin_user']=$this->admininfo["username"];
             $v['verify_log']['admin_time']=date("Y-m-d H:i:s");
             $v['verify_log'] = json_encode($v['verify_log']);
-            $v['status']=1;
+            $v['status']=2;
             $company_game_ratio_log->save($v);
             //保存到其他表
             //查找是否存在
@@ -477,6 +477,7 @@ class CompanyGameRatioController extends AdminController
 
         $data = M("company_game_ratio","tab_")
             ->where(['company_id'=>$company_id,'relation_game_id'=>$relation_game_id])
+            ->order("begin_time DESC")
             ->select();
 
         foreach($data as $key => $value) {
@@ -505,12 +506,15 @@ class CompanyGameRatioController extends AdminController
                 }
 
             } else if ($value['begin_time'] <= $begin_time)  {
-                if (!$end_time) {
+                if (!$end_time&&($value['end_time']>$begin_time||$value['end_time']==0)) {
                     M("company_game_ratio","tab_")
                         ->where(['company_id'=>$company_id,'relation_game_id'=>$relation_game_id,'begin_time'=>$value['begin_time'],'end_time'=>$value['end_time']])
                         ->save(['end_time'=>$begin_time-1]);
                     continue;
+                }else if (!$end_time) {
+                    continue;
                 }
+
                 if ($begin_time >= $value['end_time']&& $value['end_time']!=0) {
                     continue;
                 }

Application/Admin/Controller/CompanyStatementController.class.php

@@ -988,7 +988,7 @@ class CompanyStatementController extends ThinkController
 
         $start_time = strtotime($_REQUEST['time_start']);
         $end_time = strtotime($_REQUEST['time_end']) + 86399;
-        $check_add = M("company_statement","tab_")->field("statement_begin_time,statement_end_time,statement_info,company_type")->where(['company_id'=>$_REQUEST['company_id']])->select();
+        $check_add = M("company_statement","tab_")->field("statement_begin_time,statement_end_time,statement_info,company_type")->where(['company_id'=>$_REQUEST['company_id'],'withdraw_type'=>3])->select();
 
         foreach ($check_add as $key => $value) {
 
@@ -1312,7 +1312,7 @@ class CompanyStatementController extends ThinkController
                     $amount_time['promote_id'] = '-1';
                 }
                 $amount_time['tab_spend.pay_status'] = 1;
-                $amount_time['pay_way'] = ['egt',1];
+                $amount_time['pay_way'] = ['egt',0];
 
                 foreach ($statement_info as $k => $v) {
                     $statement_begin_time = strtotime($v['statement_begin_time']);
@@ -1348,7 +1348,7 @@ class CompanyStatementController extends ThinkController
                         $game_list['statement_end_time'] = $v['statement_end_time'];
                         $game_list['statement_type'] = '0';
 
-                        $statement_data[$aval['account']."-".$aval['real_name']][] = $game_list;
+                        $statement_data[$aval['account']."-".$aval['real_name']."-".$aval['promote_id']][] = $game_list;
 //                        $statement_insert[] = $statement_data;
                     }
                 }
@@ -1359,6 +1359,7 @@ class CompanyStatementController extends ThinkController
                     $proCompany_info['nickname'] = $strKey[1];
                     $statement['account'] = $strKey[0];
                     $statement['real_name'] = $strKey[1];
+                    $statement['promote_id'] = $strKey[2];
                     $statement['game_list'] = $v;
 
                     $statement['row'] = count($v);