From 0312c1bc759125320d1a2d49424ec2b9fc6964c5 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 18 Jun 2020 18:27:41 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B8=B8=E8=A7=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyGameRatio/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyGameRatio/lists.html b/Application/Admin/View/CompanyGameRatio/lists.html index 3823081d4..3aa06cbf2 100644 --- a/Application/Admin/View/CompanyGameRatio/lists.html +++ b/Application/Admin/View/CompanyGameRatio/lists.html @@ -97,7 +97,7 @@
- 搜索 + 搜索
From 701c421d0c11368569795e0899aa854464e72933 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 10:14:08 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=88=90=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyStatementSetController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Admin/Controller/CompanyStatementSetController.class.php b/Application/Admin/Controller/CompanyStatementSetController.class.php index 0436569b8..f305f59a7 100644 --- a/Application/Admin/Controller/CompanyStatementSetController.class.php +++ b/Application/Admin/Controller/CompanyStatementSetController.class.php @@ -365,6 +365,7 @@ class CompanyStatementSetController extends Controller { //获取支付记录 $paywhere = [ "pay_status"=>1, + "pay_game_status"=>1, "payed_time"=>["BETWEEN",[$begintime,$endtime]], "game_id"=>["in",$gmstr] ]; From ffb60d80a9331329b4cac706ee1f6862c7b5e1f9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:03:17 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E5=AE=B6?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E5=90=88=E4=BD=9C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 12461b49e..c4f129e25 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -302,18 +302,18 @@ class CompanyRelationController extends AdminController unset($v['remark']); unset($v['status']); unset($v['verify_log']); + //判断公司id及类型 + if($v['first_company_type'] == 0){ + $t_company_id = $v['second_company_id']; + $t_company_type = $v['second_company_type']; + }else{ + $t_company_id = $v['first_company_id']; + $t_company_type = $v['first_company_type']; + } $where = " - ( - (first_company_type ='{$v['first_company_type']}' and first_company_id = '{$v['first_company_id']}') + (first_company_type ='{$t_company_type}' and first_company_id = '{$t_company_id}') OR - (first_company_type ='{$v['second_company_type']}' and first_company_id = '{$v['second_company_id']}') - ) - AND - ( - (second_company_type ='{$v['first_company_type']}' and second_company_id = '{$v['first_company_id']}') - OR - (second_company_type ='{$v['second_company_type']}' and second_company_id = '{$v['second_company_id']}') - ) + (second_company_type ='{$t_company_type}' and second_company_id = '{$t_company_id}') "; $hasdb = $this->DBModel->where($where)->find(); if(isset($hasdb['id'])){ From 261e63b898ed63111a95ad8889aff92f2826114d Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:04:08 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9C=AA=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E7=9A=84=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/CompanyStatementLack/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/CompanyStatementLack/lists.html b/Application/Admin/View/CompanyStatementLack/lists.html index 23ee9cad4..13e2c55ca 100644 --- a/Application/Admin/View/CompanyStatementLack/lists.html +++ b/Application/Admin/View/CompanyStatementLack/lists.html @@ -205,7 +205,7 @@
- 导出 + {$_page|default=''}
From 994ee29b1dfdaa602ccbac3cb285cf3c96e786c9 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:07:03 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B9=B1=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index c47a0ef63..a0c2962bc 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -397,8 +397,8 @@ class CompanyGameRatioController extends AdminController } $id = M("company_game_ratio_log","tab_")->add($save); - addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('index')]); - $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("index")]); + addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("lists")]); } else { $companyList = D("PromoteCompany")->getList(); @@ -439,8 +439,8 @@ class CompanyGameRatioController extends AdminController $save['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); } M("company_game_ratio_log","tab_")->save($save); - addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('index')]); - $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("index")]); + addOperationLog(['op_type'=>1,'key'=>$save['id'],'op_name'=>'修改','url'=>U('lists')]); + $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("lists")]); } else { $params = I('get.'); $id = $params['id'] ?? 0; From 265384f2c8194e895eb90698aa8021c896159cdc Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:08:31 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=B9=B1=E8=B7=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index a0c2962bc..db50fa6ee 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -270,7 +270,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=1; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -290,7 +290,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=-1; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -310,7 +310,7 @@ class CompanyGameRatioController extends AdminController $v['verify_log'] = json_encode($v['verify_log']); $v['status']=-2; $company_game_ratio_log->save($v); - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, @@ -351,7 +351,7 @@ class CompanyGameRatioController extends AdminController $company_game_ratio->add($ratiov); } // - addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('lists')]); } $this->ajaxReturn(array( 'status' => 1, From a9723597f00e88393a6cc0f68c2a1fdb12cd8574 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:45:26 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E6=AF=94=E4=BE=8B=E6=9C=AA=E4=BF=AE=E6=94=B9=E9=87=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/CompanyGameRatioController.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index db50fa6ee..79522f680 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -431,6 +431,7 @@ class CompanyGameRatioController extends AdminController $save['id'] = $params['id']; $save['ratio'] = $params['ratio'] ?? 0; $save['turnover_ratio'] = $this->setTurnoverRatio($params); + $save['begin_time'] = strtotime($params['begin_time']); $save['end_time'] = $params['end_time'] ? strtotime($params['end_time'])+86399 : 0; $save['remark'] = $params['remark'] ?? ''; @@ -596,6 +597,9 @@ class CompanyGameRatioController extends AdminController $save['turnover_ratio'] = json_encode($save['turnover_ratio']); } } + if(empty($save['turnover_ratio'])){ + $save['turnover_ratio'] = ''; + } return $save['turnover_ratio']; } From 036a710f2f0e71bd3be1eae9e6f701456bffe271 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 11:52:41 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=8D=E9=87=8D=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/CompanyStatementController.class.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Application/Admin/Controller/CompanyStatementController.class.php b/Application/Admin/Controller/CompanyStatementController.class.php index 6b0a5979d..76d726486 100644 --- a/Application/Admin/Controller/CompanyStatementController.class.php +++ b/Application/Admin/Controller/CompanyStatementController.class.php @@ -253,10 +253,14 @@ class CompanyStatementController extends ThinkController $params['first_party_info'] = json_encode($params['first_party_info'],JSON_UNESCAPED_UNICODE); $params['second_party_info'] = json_encode($params['second_party_info'],JSON_UNESCAPED_UNICODE); $params['statement_info'] = json_encode($params['statement_info'],JSON_UNESCAPED_UNICODE); - $params['verify_status'] = 0; - $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); - $params['op_time'] = time(); - M("CompanyStatement","tab_")->save($params); + + $y = M("CompanyStatement", "tab_")->where("id='{$params['id']}'")->find(); + if($y['first_party_info'] != $params['first_party_info'] || $y['second_party_info'] != $params['second_party_info'] || $y['statement_info'] != $params['statement_info']){ + $params['verify_status'] = 0; + $params['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + $params['op_time'] = time(); + M("CompanyStatement","tab_")->save($params); + } $this->ajaxReturn(["code"=>0,"msg"=>"ok"]); }else{ if (!isset($_REQUEST['id'])) { From 38ab488cd07866e3c5ba29a80d478a041c78daaa Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 19 Jun 2020 14:08:04 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 11 ++++ .../Admin/View/CompanyRelation/index.html | 56 ++++++++----------- .../Admin/View/CompanyRelation/lists.html | 54 +++++++----------- 3 files changed, 53 insertions(+), 68 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index c4f129e25..81c3a25ee 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -57,6 +57,11 @@ class CompanyRelationController extends AdminController if(isset($params['company_id'])){ $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; } + if(isset($params['company_type']) && isset($params['company_id'])){ + unset($where['_string']); + $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + } + if(isset($params['settlement_type'])){ $where['settlement_type'] = $params['settlement_type']; } @@ -129,7 +134,13 @@ class CompanyRelationController extends AdminController } if(isset($params['company_id'])){ $where['_string'] .= " AND (first_company_id='{$params['company_id']}' OR second_company_id='{$params['company_id']}')"; + } + if(isset($params['company_type']) && isset($params['company_id'])){ + unset($where['_string']); + $where['_string'] .= " (first_company_id='{$params['company_id']}' AND first_company_type='{$params['company_type']}') OR (second_company_id='{$params['company_id']}' AND second_company_type='{$params['company_type']}')"; + } + if(isset($params['settlement_type'])){ $where['settlement_type'] = $params['settlement_type']; } diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index 99db117c6..27f727a81 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -195,48 +195,36 @@ $(function(){ $("#search").click(); } }); + + var loop = 1; var company_id = "{$_GET['company_id']??0}"; - $("#company_type").on("change",function(){ var type = $(this).find("option:selected").val(); - var typename=setTypeName(type); - var url = "{:U('getCompanyList')}"+"&type="+type; - $.get(url,function(data){ - var company = data.info; - var companystr = ''; - for (var i in company) { - if(company[i].id == company_id){ - companystr += "" - }else{ - companystr += "" + if(type != ''){ + var url = "{:U('getCompanyList')}"+"&type="+type; + $.get(url,function(data){ + var company = data.info; + console.log(company) + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id && loop==1){ + companystr += "" + }else{ + companystr += "" + } } - } + $("#company_id").html(companystr); + $("#company_id").select2(); + loop++; + }) + }else{ + var companystr = ''; $("#company_id").html(companystr); $("#company_id").select2(); - }) + } }) $("#company_type").change(); - - function setTypeName(type) { - var typename = ''; - switch (type) { - case '': - typename ="请先选择公司类型"; - break; - case '0': - typename = "请选择已方公司"; - break; - case "1": - typename = "请选择上游CP公司"; - break; - case "2": - typename ="请选择联运下游渠道公司";; - break; - default: - break; - } - return typename; - } + }) diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index d20028eb7..46fd3c8dd 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -268,29 +268,35 @@ $(function(){ $("#search").click(); } }); + var loop = 1; var company_id = "{$_GET['company_id']??0}"; - $("#company_type").on("change",function(){ var type = $(this).find("option:selected").val(); - var typename=setTypeName(type); - var url = "{:U('getCompanyList')}"+"&type="+type; - $.get(url,function(data){ - var company = data.info; - var companystr = ''; - for (var i in company) { - if(company[i].id == company_id){ - companystr += "" - }else{ - companystr += "" + if(type != ''){ + var url = "{:U('getCompanyList')}"+"&type="+type; + $.get(url,function(data){ + var company = data.info; + console.log(company) + var companystr = ''; + for (var i in company) { + if(company[i].id == company_id && loop==1){ + companystr += "" + }else{ + companystr += "" + } } - } + $("#company_id").html(companystr); + $("#company_id").select2(); + loop++; + }) + }else{ + var companystr = ''; $("#company_id").html(companystr); $("#company_id").select2(); - }) + } }) $("#company_type").change(); - $(".editRelation").on("click",function(){ var id = $(this).data("id"); var url = "{:U('editRelation')}"+"&id="+id; @@ -382,26 +388,6 @@ $(function(){ }); } }) - function setTypeName(type) { - var typename = ''; - switch (type) { - case '': - typename ="请先选择公司类型"; - break; - case '0': - typename = "请选择已方公司"; - break; - case "1": - typename = "请选择上游CP公司"; - break; - case "2": - typename ="请选择联运下游渠道公司";; - break; - default: - break; - } - return typename; - } })