From fdccc92c43407cf7ae7adafc524bc49a5fb06008 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 14:30:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8F=AA=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=84=9A=E6=9C=AC=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- Application/Admin/View/CompanyRelation/lists.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index f305f59a7..199f57717 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(); 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 @@
生效列表 - 审核列表 + 审核列表

公司绑定审核列表

From ec641257b0e31b911b2a1ee34ecd9c0583f82550 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 15:23:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8B=E6=B8=B8?= =?UTF-8?q?=E6=B8=A0=E9=81=93=E7=BB=93=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 199f57717..8eaf228ad 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -475,7 +475,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']; From 0ba02069a0342ea9b37fb11167bb34defdf295c8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 15:56:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=A1=A5=E7=82=B9?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/extend.php | 1 + .../CompanyStatementSetController.class.php | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) 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 8eaf228ad..ec60a0635 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -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;} } } @@ -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;