From ab9be654227d1178c4159a6f4edcd9f28591bdd0 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 18 Sep 2020 15:36:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=85=AC=E5=8F=B8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MarketPercentageController.class.php | 3 ++- .../Controller/TimingController.class.php | 14 +++++++++--- .../Model/CompanyGameRatioModel.class.php | 22 ++++++++++--------- .../MarketPercentage/marketstaffsettle.html | 8 +++++-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php index f18076995..9d5c8cc22 100644 --- a/Application/Admin/Controller/MarketPercentageController.class.php +++ b/Application/Admin/Controller/MarketPercentageController.class.php @@ -343,8 +343,9 @@ class MarketPercentageController extends ThinkController $admin = $_SESSION['onethink_admin']['user_auth']['username']; foreach ($data as $key => $value) { + $Rule = strtolower(MODULE_NAME . '/' . CONTROLLER_NAME . '/' . ACTION_NAME . "_export_show_check"); - if ($_REQUEST['export'] && session('user_group_id') == 23) { + if ($_REQUEST['export'] && $this->checkRule($Rule,array('in','1,2'))) { if (!$value['market_check'] || !$value['finance_check']) { unset($data[$key]); diff --git a/Application/Admin/Controller/TimingController.class.php b/Application/Admin/Controller/TimingController.class.php index 165449955..ce71f40f4 100644 --- a/Application/Admin/Controller/TimingController.class.php +++ b/Application/Admin/Controller/TimingController.class.php @@ -769,6 +769,7 @@ class TimingController extends AdminController { $return = []; foreach ($data as $key => $value) { $statement_info = json_decode($value['statement_info'],true); + $is_inside = M("PromoteCompany","tab_")->field("is_inside")->where("id='{$value['company_id']}'")->find()['is_inside']; if ($value['company_type'] == 2) { @@ -777,9 +778,9 @@ class TimingController extends AdminController { foreach ($info as $k => $v) { // if (isset($return[$statement_info['promote_id'].$v['relation_game_id']])) { - $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] = $v['sum_money']; + $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] = !$is_inside?$v['sum_money']:0; } else { - $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] += $v['sum_money']; + $return[$value['company_id']."-".$sval['promote_id']."-".$v['relation_game_id']] += !$is_inside?$v['sum_money']:0; } } @@ -811,7 +812,7 @@ class TimingController extends AdminController { ->group("promote_id") ->find(); - $return[$value['company_id']."-".$promote_id."-".$v['relation_game_id']] += ($dataAmount['pay_amount']*$v['increment_ratio'])/100; + $return[$value['company_id']."-".$promote_id."-".$v['relation_game_id']] += !$is_inside?(($dataAmount['pay_amount']*$v['increment_ratio'])/100):0; } } @@ -839,6 +840,13 @@ class TimingController extends AdminController { $begintime = strtotime(date("Y-m-1",strtotime($date))); $endtime = strtotime(date("Y-m-t",strtotime($date)))+86399; + + $is_inside = M("PromoteCompany","tab_")->field("is_inside")->where("id='{$company_id}'")->find()['is_inside']; + + if ($is_inside == 1) { + return 0; + } + $company_game_ratio = M("company_game_ratio","tab_") ->where(['company_id'=>$company_id,'relation_game_id'=>$relation_game_id]) ->where("(end_time>={$begintime} and (end_time<={$endtime} and end_time!=0)) or (begin_time>={$begintime} and begin_time<={$endtime}) or (begin_time<={$begintime} and (end_time>={$endtime} or end_time=0))") diff --git a/Application/Admin/Model/CompanyGameRatioModel.class.php b/Application/Admin/Model/CompanyGameRatioModel.class.php index f2ebb4f1f..917a68744 100644 --- a/Application/Admin/Model/CompanyGameRatioModel.class.php +++ b/Application/Admin/Model/CompanyGameRatioModel.class.php @@ -23,7 +23,9 @@ class CompanyGameRatioModel extends Model if($company_belong === false){ $company_belong = M("PromoteCompany","tab_")->field("company_belong")->where("id='{$company_id}'")->find()['company_belong']; } - + + $is_inside = M("PromoteCompany","tab_")->field("is_inside")->where("id='{$company_id}'")->find()['is_inside']; + $mwhere = [ "company_belong"=>$company_belong, "relation_game_id"=>["in",$game_ids] @@ -55,13 +57,13 @@ class CompanyGameRatioModel extends Model if($v['end_time'] == 0 || ($v['end_time'] >= $last_time_ratio['endtime'])){ //全段 if($v['begin_time'] <= $last_time_ratio['begintime']){ - $tgr[count($tgr)-1]['ratio'] = $v['ratio']; - $tgr[count($tgr)-1]['turnover_ratio'] = $v['turnover_ratio']; + $tgr[count($tgr)-1]['ratio'] = !$is_inside?$v['ratio']:0; + $tgr[count($tgr)-1]['turnover_ratio'] = !$is_inside?$v['turnover_ratio']:[]; continue; }else{ //上分段 $tgr[count($tgr)-1]['endtime'] = $v['begin_time']-1; - $tgr[] = ['begintime'=>$v['begin_time'],"endtime"=>$last_time_ratio['endtime'],"ratio"=>$v['ratio'],"turnover_ratio"=>$v['turnover_ratio']]; + $tgr[] = ['begintime'=>$v['begin_time'],"endtime"=>$last_time_ratio['endtime'],"ratio"=>!$is_inside?$v['ratio']:0,"turnover_ratio"=>!$is_inside?$v['turnover_ratio']:[]]; continue; } } @@ -70,7 +72,7 @@ class CompanyGameRatioModel extends Model //中段 $tgr[count($tgr)-1]['endtime'] = $v['begin_time']-1; - $tgr[] = ['begintime'=>$v['begin_time'],"endtime"=>$v['end_time'],"ratio"=>$v['ratio'],"turnover_ratio"=>$v['turnover_ratio']]; + $tgr[] = ['begintime'=>$v['begin_time'],"endtime"=>$v['end_time'],"ratio"=>!$is_inside?$v['ratio']:0,"turnover_ratio"=>!$is_inside?$v['turnover_ratio']:[]]; $tgr[] = ['begintime'=>$v['end_time']-0+1,"endtime"=>$last_time_ratio['endtime']]; continue; @@ -78,13 +80,13 @@ class CompanyGameRatioModel extends Model if($last_time_ratio['begintime'] > $v['begin_time']){ //下分段 $tgr[count($tgr)-1]['endtime'] = $v['end_time']; - $tgr[] = ['begintime'=>$v['end_time']-0+1,"endtime"=>$last_time_ratio['endtime'],"ratio"=>$v['ratio'],"turnover_ratio"=>$v['turnover_ratio']]; + $tgr[] = ['begintime'=>$v['end_time']-0+1,"endtime"=>$last_time_ratio['endtime'],"ratio"=>!$is_inside?$v['ratio']:0,"turnover_ratio"=>!$is_inside?$v['turnover_ratio']:[]]; continue; } if($last_time_ratio['begintime'] = $v['begin_time']){ $tgr[count($tgr)-1]['endtime'] = $v['end_time']; - $tgr[count($tgr)-1]['ratio'] = $v['ratio']; - $tgr[count($tgr)-1]['turnover_ratio'] = $v['turnover_ratio']; + $tgr[count($tgr)-1]['ratio'] = !$is_inside?$v['ratio']:0; + $tgr[count($tgr)-1]['turnover_ratio'] = !$is_inside?$v['turnover_ratio']:[]; $tgr[] = ['begintime'=>$v['end_time']-0+1,"endtime"=>$last_time_ratio['endtime']]; } @@ -95,8 +97,8 @@ class CompanyGameRatioModel extends Model foreach($list as $i => &$ratio){ if(!isset($ratio['ratio'])){ if(isset($modul_ratio[$k]['ratio'])){ - $ratio['ratio'] = $modul_ratio[$k]['ratio']; - $ratio['turnover_ratio'] = $modul_ratio[$k]['turnover_ratio']; + $ratio['ratio'] = !$is_inside?$modul_ratio[$k]['ratio']:0; + $ratio['turnover_ratio'] = !$is_inside?$modul_ratio[$k]['turnover_ratio']:null; }else{ $ratio['ratio'] = 0; $ratio['turnover_ratio'] =null; diff --git a/Application/Admin/View/MarketPercentage/marketstaffsettle.html b/Application/Admin/View/MarketPercentage/marketstaffsettle.html index 8c708690d..27707d78d 100644 --- a/Application/Admin/View/MarketPercentage/marketstaffsettle.html +++ b/Application/Admin/View/MarketPercentage/marketstaffsettle.html @@ -127,8 +127,12 @@
- 市场部确认 - 财务部审批 + + 市场部确认 + + + 财务部审批 +