diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index 5dcb80a9f..e78bd275c 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2159,6 +2159,7 @@ function getGamePromoteCompanyRadio($company_id,$relation_game_id,$endtime,$amou //判断是否有生效 $rwhere = "(end_time = 0 OR end_time >= '{$endtime}') and company_id='{$company_id}' and relation_game_id='{$relation_game_id}'"; $cgr_res = M("CompanyGameRatio","tab_")->where($rwhere)->find(); + // dump( M("CompanyGameRatio","tab_")->where($rwhere)->select(false)); if(empty($cgr_res)){ //模板搜索 //获取公司类型 diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index f305f59a7..ec60a0635 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -48,7 +48,7 @@ class CompanyStatementSetController extends Controller { public function setDailyCount($stime="now") { if(!IS_CLI){ - // die("只支持脚本访问"); + die("只支持脚本访问"); } if($stime=="now"){ $stime=time(); @@ -263,6 +263,7 @@ class CompanyStatementSetController extends Controller { $tratio1 = getGameCpRadio($game_id['id'],$va['pay_money'],true); $tratio2 = getGameCpRadio($game_id['id'],$va['pay_money'],false); $tratio = $tratio1-$tratio2; + if($tratio <= 0){continue;} } } @@ -475,7 +476,7 @@ class CompanyStatementSetController extends Controller { $add_data=[]; //1.获取甲乙方信息 - if($v['first_company_type'] == 1){ + if($v['first_company_type'] > 0){ //甲方合作 $pc[$v['first_company_id']]['invoice_type'] = $v['invoice_type']; $pc[$v['first_company_id']]['invoice_content'] = $v['invoice_content']; @@ -528,6 +529,7 @@ class CompanyStatementSetController extends Controller { $tratio1 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; $tratio2 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); $tratio = $tratio1-$tratio2; + if($tratio <= 0){ continue;} } if($v['type'] == 2){ @@ -766,17 +768,19 @@ class CompanyStatementSetController extends Controller { $game['game_type_name'] = $this->getGameTypeName($va['relation_game_id']); if($type == 1){ - $tratio = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong); + $tratio = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong); }elseif($type == 0){ - $tratio = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); + $tratio = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); }else{ //补点 - $tratio1 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; - $tratio2 = getGamePromoteCompanyRadio($add_data['company_id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); + $tratio1 = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],true,$company_belong);; + $tratio2 = getGamePromoteCompanyRadio($v['id'],$va['relation_game_id'],$endtime,$va['pay_amount'],false,$company_belong); $tratio = $tratio1-$tratio2; + if($tratio <= 0){ + continue; + } } - - if($v['type'] == 2){ + if($type == 2){ $game['increment_ratio']=$tratio; }else{ $game['ratio']=$tratio; diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index 46fd3c8dd..782f0779b 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -57,7 +57,7 @@