From 5a962e1b73e27ff55d95898bacbff5b053472676 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 23 Jul 2020 16:12:17 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E6=88=90?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 171 ++++++++-- .../Admin/View/CompanyRelation/edit.html | 302 ++++++++++++++++++ .../Admin/View/CompanyRelation/index.html | 19 ++ 3 files changed, 473 insertions(+), 19 deletions(-) create mode 100644 Application/Admin/View/CompanyRelation/edit.html diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 5e445006c..4b83abb45 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -61,6 +61,12 @@ class CompanyRelationController extends AdminController $params = I('get.'); $page = $params['p'] ? intval($params['p']) : 1; $row = $params['row'] ? intval($params['row']) : 10; + + //权限分配 + if(!IS_ROOT){ + $this->OpAuthList= getModuleControllerAuth(); + } + $where['_string'] = '1 = 1'; if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; @@ -83,7 +89,6 @@ class CompanyRelationController extends AdminController $where['is_payment'] = $params['is_payment']; } - // $this->checkListOrCountAuthRestMap($where);//导出权限 $dbres = $this->DBModel->where($where)->order("id desc");; if(isset($params['export'])){ $dbres = $dbres->select(); @@ -97,6 +102,7 @@ class CompanyRelationController extends AdminController $v['invoice_type'] =$this->InvoiceType[$v['invoice_type']]; $v['is_payment'] =$this->IsPayment[$v['is_payment']]; $v['collection'] =$this->Collection[$v['collection']]; + $v['oplist'] = $this->listOpAuth($v); } if(isset($_REQUEST['export'])){ @@ -127,6 +133,7 @@ class CompanyRelationController extends AdminController $this->assign('CompanyType',$this->CompanyType); $this->assign('InvoiceType',$this->InvoiceType); $this->assign('IsPayment',$this->IsPayment); + $this->assign('menubtn',$this->listMenuAuth()); $this->display(); } //审核列表 @@ -364,7 +371,19 @@ class CompanyRelationController extends AdminController } $params['remark'] = $params['remark'] ?? ''; $params['status'] = 0; - $params['verify_log']=json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + + $verify_log = [ + "create_user"=>$this->admininfo["username"], + "create_time"=>date("Y-m-d H:i:s") + ]; + if($params['first_company_type'] == 1 || $params['second_company_type'] == 1){ + //上游公司 + $verify_log['market_user']= "AUTO"; + $verify_log['market_time']= date("Y-m-d H:i:s"); + $params['status'] = 1; + } + + $params['verify_log']=json_encode($verify_log); //判断已有未审核 $where = " ( @@ -378,14 +397,22 @@ class CompanyRelationController extends AdminController OR (second_company_type ='{$params['second_company_type']}' and second_company_id = '{$params['second_company_id']}') ) - AND - status < 2 "; - $hasdb = $this->DBlogModel->field("count(id) count")->where($where)->find()['count']; - if($hasdb > 0){ - $this->error('当前甲乙双方已有审批单,请直接搜索后修改'); + $r_res = $this->DBModel->where($where)->find(); + if(!empty($r_res)){ + $this->error('当前甲乙双方已有绑定关系'); + } + + $hasdb = $this->DBlogModel->where($where)->find(); + if(!empty($hasdb)){ + //覆盖 + $params['id'] = $hasdb['id']; + $this->DBlogModel->save($params); + $id = $hasdb['id']; + }else{ + //新增 + $id = $this->DBlogModel->add($params); } - $id = $this->DBlogModel->add($params); addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('lists')]); $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("lists")]); @@ -396,7 +423,40 @@ class CompanyRelationController extends AdminController $this->display(); } } - public function editRelation() + // public function editRelation() + // { + // if ($_POST) { + // $p= I('post.'); + // if(!isset($p['id'])){ + // $this->error('参数错误'); + // } + // //查询 + // $y = $this->DBlogModel->where("id='{$p['id']}'")->find(); + // $p['remark'] = $p['remark'] ?? ''; + // if($y['settlement_type'] != $p['settlement_type'] || $y['invoice_type'] != $p['invoice_type'] || $y['invoice_content'] != $p['invoice_content'] || $y['is_payment'] != $p['is_payment'] || $y['collection'] != $p['collection']){ + // $p['status'] = 0; + // $p['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + // } + // $this->DBlogModel->save($p); + // addOperationLog(['op_type'=>1,'key'=>$p['id'],'op_name'=>'修改','url'=>U('lists')]); + // $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("lists")]); + // } else { + // $params = I('get.'); + // $id = $params['id'] ?? 0; + // $id = intval($id); + // $map['id'] = $id; + // $dbres = $this->DBlogModel->where($map)->find(); + // $this->assign('first_company_info',$this->getCompanyInfo($dbres['first_company_type'],$dbres['first_company_id'])); + // $this->assign('second_company_info',$this->getCompanyInfo($dbres['second_company_type'],$dbres['second_company_id'])); + + // $dbres['first_company_type'] =$this->CompanyType[$dbres['first_company_type']]; + // $dbres['second_company_type'] =$this->CompanyType[$dbres['second_company_type']]; + + // $this->assign('data', $dbres); + // $this->display(); + // } + // } + public function edit() { if ($_POST) { $p= I('post.'); @@ -404,21 +464,55 @@ class CompanyRelationController extends AdminController $this->error('参数错误'); } //查询 - $y = $this->DBlogModel->where("id='{$p['id']}'")->find(); - $p['remark'] = $p['remark'] ?? ''; + $y = $this->DBModel->where("id='{$p['id']}'")->find(); if($y['settlement_type'] != $p['settlement_type'] || $y['invoice_type'] != $p['invoice_type'] || $y['invoice_content'] != $p['invoice_content'] || $y['is_payment'] != $p['is_payment'] || $y['collection'] != $p['collection']){ + //修改了进行审核 $p['status'] = 0; - $p['verify_log'] = json_encode(["create_user"=>$this->admininfo["username"],"create_time"=>date("Y-m-d H:i:s")]); + $verify_log = [ + "create_user"=>$this->admininfo["username"], + "create_time"=>date("Y-m-d H:i:s") + ]; + if($p['first_company_type'] == 1 || $p['second_company_type'] == 1){ + //上游公司 + $verify_log['market_user']= "AUTO"; + $verify_log['market_time']= date("Y-m-d H:i:s"); + $p['status'] = 1; + } + $p['verify_log'] = json_encode($verify_log); + } + + $where = " + ( + (first_company_type ='{$p['first_company_type']}' and first_company_id = '{$p['first_company_id']}') + OR + (first_company_type ='{$p['second_company_type']}' and first_company_id = '{$p['second_company_id']}') + ) + AND + ( + (second_company_type ='{$p['first_company_type']}' and second_company_id = '{$p['first_company_id']}') + OR + (second_company_type ='{$p['second_company_type']}' and second_company_id = '{$p['second_company_id']}') + ) + "; + $hasdb = $this->DBlogModel->where($where)->find(); + if(!empty($hasdb)){ + //覆盖 + $p['id'] = $hasdb['id']; + $this->DBlogModel->save($p); + $id = $hasdb['id']; + }else{ + //新增 + $id = $this->DBlogModel->add($p); } - $this->DBlogModel->save($p); addOperationLog(['op_type'=>1,'key'=>$p['id'],'op_name'=>'修改','url'=>U('lists')]); $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("lists")]); + } else { $params = I('get.'); $id = $params['id'] ?? 0; $id = intval($id); $map['id'] = $id; - $dbres = $this->DBlogModel->where($map)->find(); + $dbres = $this->DBModel->where($map)->find(); $this->assign('first_company_info',$this->getCompanyInfo($dbres['first_company_type'],$dbres['first_company_id'])); $this->assign('second_company_info',$this->getCompanyInfo($dbres['second_company_type'],$dbres['second_company_id'])); @@ -500,11 +594,50 @@ class CompanyRelationController extends AdminController } return $companyInfo; } - public function menuAuth() - { + + protected function listMenuAuth(){ $addurl = U("addRelation"); $mentBtn = [ - "addRelation"=>"新增公司绑定", + "addRelation"=>"新增公司绑定" + ]; + $resarr = []; + foreach ($mentBtn as $k => $v) { + if(IS_ROOT){ + $resarr[] = $v; + }else{ + if(in_array($k,$this->OpAuthList)){ + $resarr[] = $v; + } + } + } + return $resarr; + } + protected function listOpAuth($info){ + $id = $info['id']; + //原始列表 + $opBtn = [ + "edit"=>"编辑", + "del"=>"删除", + ]; + //操作对应菜单 + $optist = ["edit","del"]; + $resarr = []; + foreach ($optist as $k => $v) { + if(IS_ROOT){ + $resarr[] = $opBtn[$v]; + }else{ + if(in_array($v,$this->OpAuthList)){ + $resarr[] = $opBtn[$v]; + } + } + } + return $resarr; + } + + protected function menuAuth() + { + + $mentBtn = [ "marketAgree"=>"市场部审批通过", "marketRefuse"=>"市场部审核拒绝", "adminAgree"=>"管理员审核通过", @@ -522,7 +655,7 @@ class CompanyRelationController extends AdminController } return $resarr; } - public function OpAuth($info) + protected function OpAuth($info) { $id = $info['id']; //原始列表 @@ -551,7 +684,7 @@ class CompanyRelationController extends AdminController return $resarr; } - public function error($data) + protected function error($data) { header('Content-Type:application/json; charset=utf-8'); $data =json_encode(['msg'=>$data,"code"=>4000],JSON_UNESCAPED_UNICODE); diff --git a/Application/Admin/View/CompanyRelation/edit.html b/Application/Admin/View/CompanyRelation/edit.html new file mode 100644 index 000000000..e12db552e --- /dev/null +++ b/Application/Admin/View/CompanyRelation/edit.html @@ -0,0 +1,302 @@ + + + + + + + + + + + + +
+

编辑公司绑定

+

说明：修改后需要走审批流程，通过后才会覆盖。如需调换甲乙公司，请删除后重新添加

+
+ + +
+
+ +
+
+ +
+ + + + + + + + + + + + + + + +
甲方公司类型: + {$data.first_company_type} +
甲方公司: + {$data.first_company_name} +
+
+ +
+ + + + + + + + + + + + + + + +
乙方公司类型: + {$data.second_company_type} +
乙方公司: + {$data.second_company_name} +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*结算周期: + + +
*开票类型: + + +
开票内容： + +
是否有打款流程: + + + + + 选择否将不能进行线上打款 +
*收款方: + + +
备注： + + +
+
+ +
+ + + 返回 + +
+
+
+
+ + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + + diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index eb9bf0acb..3069a881d 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -109,6 +109,13 @@ +
+
+ + {$vo} + +
+
@@ -125,6 +132,7 @@ 开票内容 打款流程 收款方 + 操作 @@ -146,6 +154,12 @@ {$data.invoice_content} {$data.is_payment} {$data.collection} + + + {$vo} + + + @@ -193,6 +207,11 @@ $(function(){ $("#search").click(); } }); + $(".edit").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('edit')}"+"&id="+id; + window.location.href = url; + }) var loop = 1; var company_id = "{$_GET['company_id']??0}"; From 4dd8526e2b949ed0326ba531938b2f88b6d7f239 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 23 Jul 2020 17:16:02 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteCompanyController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php index 8368ccde8..9ee2abd1b 100644 --- a/Application/Admin/Controller/PromoteCompanyController.class.php +++ b/Application/Admin/Controller/PromoteCompanyController.class.php @@ -523,7 +523,7 @@ class PromoteCompanyController extends ThinkController $save['turnover_ratio'] = $this->setTurnoverRatio($save); $res = D("PromoteCompanyVerify")->edit_db($save); if ($res) { - addOperationLog(['op_type'=>1,'key'=>$_POST['company_name'],'op_name'=>'编辑推广公司','url'=>U('PromoteCompany/lists'),'menu'=>'推广员-推广员管理-推广公司管理-编辑推广公司']); + addOperationLog(['op_type'=>1,'key'=>$_POST['company_name'],'op_name'=>'编辑推广公司','url'=>U('PromoteCompany/lists')]); $array=array( "info"=>"修改成功,请联系管理员尽快审核", "status"=>1 From 832f531d20afdf0ae399a45aff83e9c5e236b008 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 23 Jul 2020 20:05:38 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 89 ++++++++++++------- .../Admin/View/CompanyRelation/index.html | 25 ++++++ .../Admin/View/CompanyRelation/lists.html | 2 - 3 files changed, 81 insertions(+), 35 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 4b83abb45..fc80ec77f 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -384,23 +384,23 @@ class CompanyRelationController extends AdminController } $params['verify_log']=json_encode($verify_log); - //判断已有未审核 - $where = " - ( - (first_company_type ='{$params['first_company_type']}' and first_company_id = '{$params['first_company_id']}') - OR - (first_company_type ='{$params['second_company_type']}' and first_company_id = '{$params['second_company_id']}') - ) - AND - ( - (second_company_type ='{$params['first_company_type']}' and second_company_id = '{$params['first_company_id']}') + //判断哪方是非官方 + if($params['first_company_type'] > 0){ + $where = " + (first_company_type ='{$params['first_company_type']}' and first_company_id = '{$params['first_company_id']}') OR + (second_company_type ='{$params['first_company_type']}' and second_company_id = '{$params['first_company_id']}') + "; + }else{ + $where = " + (first_company_type ='{$params['second_company_type']}' and first_company_id = '{$params['second_company_id']}') + OR (second_company_type ='{$params['second_company_type']}' and second_company_id = '{$params['second_company_id']}') - ) - "; + "; + } $r_res = $this->DBModel->where($where)->find(); if(!empty($r_res)){ - $this->error('当前甲乙双方已有绑定关系'); + $this->error('当前合作方已有绑定关系'); } $hasdb = $this->DBlogModel->where($where)->find(); @@ -413,8 +413,8 @@ class CompanyRelationController extends AdminController //新增 $id = $this->DBlogModel->add($params); } - addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('lists')]); - $this->ajaxReturn(["msg"=>"添加成功","code"=>1,"url"=>U("lists")]); + addOperationLog(['op_type'=>0,'key'=>$id,'op_name'=>'新增','url'=>U('index')]); + $this->ajaxReturn(["msg"=>"添加成功,请联系管理员尽快审核","code"=>1,"url"=>U("index")]); } else { $this->assign('defaultCompanyTypeA', self::COMPANY_TYPE_DEFAULT_A); @@ -463,6 +463,7 @@ class CompanyRelationController extends AdminController if(!isset($p['id'])){ $this->error('参数错误'); } + //查询 $y = $this->DBModel->where("id='{$p['id']}'")->find(); if($y['settlement_type'] != $p['settlement_type'] || $y['invoice_type'] != $p['invoice_type'] || $y['invoice_content'] != $p['invoice_content'] || $y['is_payment'] != $p['is_payment'] || $y['collection'] != $p['collection']){ @@ -472,28 +473,34 @@ class CompanyRelationController extends AdminController "create_user"=>$this->admininfo["username"], "create_time"=>date("Y-m-d H:i:s") ]; - if($p['first_company_type'] == 1 || $p['second_company_type'] == 1){ + if($y['first_company_type'] == 1 || $y['second_company_type'] == 1){ //上游公司 $verify_log['market_user']= "AUTO"; $verify_log['market_time']= date("Y-m-d H:i:s"); $p['status'] = 1; } $p['verify_log'] = json_encode($verify_log); + //其他信息 + $p['first_company_id'] = $y['first_company_id']; + $p['first_company_name'] = $y['first_company_name']; + $p['first_company_type'] = $y['first_company_type']; + $p['second_company_id'] = $y['second_company_id']; + $p['second_company_name'] = $y['second_company_name']; + $p['second_company_type'] = $y['second_company_type']; + } + if($p['first_company_type'] > 0){ + $where = " + (first_company_type ='{$p['first_company_type']}' and first_company_id = '{$p['first_company_id']}') + OR + (second_company_type ='{$p['first_company_type']}' and second_company_id = '{$p['first_company_id']}') + "; + }else{ + $where = " + (first_company_type ='{$p['second_company_type']}' and first_company_id = '{$p['second_company_id']}') + OR + (second_company_type ='{$p['second_company_type']}' and second_company_id = '{$p['second_company_id']}') + "; } - - $where = " - ( - (first_company_type ='{$p['first_company_type']}' and first_company_id = '{$p['first_company_id']}') - OR - (first_company_type ='{$p['second_company_type']}' and first_company_id = '{$p['second_company_id']}') - ) - AND - ( - (second_company_type ='{$p['first_company_type']}' and second_company_id = '{$p['first_company_id']}') - OR - (second_company_type ='{$p['second_company_type']}' and second_company_id = '{$p['second_company_id']}') - ) - "; $hasdb = $this->DBlogModel->where($where)->find(); if(!empty($hasdb)){ //覆盖 @@ -504,8 +511,8 @@ class CompanyRelationController extends AdminController //新增 $id = $this->DBlogModel->add($p); } - addOperationLog(['op_type'=>1,'key'=>$p['id'],'op_name'=>'修改','url'=>U('lists')]); - $this->ajaxReturn(["msg"=>"修改成功","code"=>1,"url"=>U("lists")]); + addOperationLog(['op_type'=>1,'key'=>$p['id'],'op_name'=>'修改','url'=>U('index')]); + $this->ajaxReturn(["msg"=>"修改成功,请联系管理员尽快审核","code"=>1,"url"=>U("index")]); } else { $params = I('get.'); @@ -523,6 +530,22 @@ class CompanyRelationController extends AdminController $this->display(); } } + + public function del() + { + if(!isset($_REQUEST['id'])){ + $this->error('参数错误'); + } + $id = $_REQUEST['id']; + $res = $this->DBModel->where("id='{$id}'")->delete(); + if($res !== false){ + addOperationLog(['op_type'=>2,'key'=>$id,'op_name'=>'删除','url'=>U('index')]); + $this->ajaxReturn(["msg"=>"删除成功","code"=>1,"url"=>U("index")]); + }else{ + $this->error('删除错误'); + } + } + public function delRelation() { if(!isset($_REQUEST['id'])){ @@ -668,7 +691,7 @@ class CompanyRelationController extends AdminController if($info['status'] == 2){ $optist = []; }else{ - $optist = ["editRelation","delRelation"]; + $optist = ["delRelation"]; } // $resarr = []; diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index 3069a881d..1b9ba8636 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -48,6 +48,9 @@ font-weight: 600; font-size: 18px; } + .confirm{ + cursor: pointer; + }
@@ -212,6 +215,28 @@ $(function(){ var url = "{:U('edit')}"+"&id="+id; window.location.href = url; }) + $(".del").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('del')}"+"&id="+id; + layer.confirm('删除后将无法恢复，请慎重选择', { + closeBtn:0, + title:false, + btn: ['取消','删除'] //按钮 + }, function(index){ + layer.close(index); + }, function(){ + $.get(url,function(data){ + if(data.code == 1){ + layer.msg(''+data.msg+'',{time: 1000},function(){ + window.location.reload(); + }); + + }else{ + layer.msg(data.msg,{icon: 2}); + } + }); + }); + }) var loop = 1; var company_id = "{$_GET['company_id']??0}"; diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index 5c201a45c..8a8e036e0 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -228,8 +228,6 @@
- 导出 {$_page|default=''}
From 3ff79ce6c18dd7d70f4c75466f24e31953efd5a8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Thu, 23 Jul 2020 20:10:55 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyRelationController.class.php | 17 ++++------------- .../Admin/View/CompanyRelation/index.html | 9 +++++++-- .../Admin/View/CompanyRelation/lists.html | 8 ++++++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index fc80ec77f..75cceab18 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -71,12 +71,8 @@ class CompanyRelationController extends AdminController if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; } - 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['company_name'])){ + $where['_string'] .= " AND (first_company_name LIKE '%{$params['company_name']}%' OR second_company_name LIKE '%{$params['company_name']}%')"; } if(isset($params['settlement_type'])){ @@ -150,13 +146,8 @@ class CompanyRelationController extends AdminController if(isset($params['company_type'])){ $where['_string'] .= " AND (first_company_type='{$params['company_type']}' OR second_company_type='{$params['company_type']}')"; } - 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['company_name'])){ + $where['_string'] .= " AND (first_company_name LIKE '%{$params['company_name']}%' OR second_company_name LIKE '%{$params['company_name']}%')"; } if(isset($params['settlement_type'])){ diff --git a/Application/Admin/View/CompanyRelation/index.html b/Application/Admin/View/CompanyRelation/index.html index 1b9ba8636..e38614566 100644 --- a/Application/Admin/View/CompanyRelation/index.html +++ b/Application/Admin/View/CompanyRelation/index.html @@ -76,11 +76,16 @@
-
+ +
+   +
+ +
-
+
+   +
+ +
原包名 + + + + 用于上游结算时显示的游戏名称 + + + 游戏排序： diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 4db4ca49f..a1facd9bc 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -175,6 +175,22 @@ 设置游戏的推荐类型，更改此游戏在网站所属的推荐板块； + + + 推荐状态 + + + + + + 用于上游结算时显示的游戏名称，修改后将同步关联游戏 + + + 游戏排序： diff --git a/Data/update.sql b/Data/update.sql index a1bb79dad..9784407ca 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -2237,4 +2237,8 @@ CREATE TABLE `tab_payment_member` ( INSERT INTO `tab_payment_member` (`id`, `real_name`, `mobile`, `last_login_time`) VALUES ('1', '胡歌', '18959188422', '0') +--chenzhi 游戏新增结算包名 +ALTER TABLE `tab_game` +ADD COLUMN `select_package_name` tinyint(2) NOT NULL DEFAULT 0 COMMENT '结算包名 0:原包名 1:现包名' AFTER `original_package_name`; + From 8ded1f31694ff5f0c85f9df85720194663c6e960 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 24 Jul 2020 14:05:38 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GameRatioMouldController.class.php | 41 +++++++++------ .../Admin/View/GameRatioMould/index.html | 51 ++++++++++--------- 2 files changed, 53 insertions(+), 39 deletions(-) diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index 1183e0b55..f56269f05 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -46,22 +46,9 @@ class GameRatioMouldController extends AdminController foreach($dbres as $k=>&$v){ $v['create_time'] = date("Y-m-d H:i:s",$v['create_time']); $v['company_belong'] ="下游".getCompanyBlong($v['company_belong']); - - $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : []; - $thisRatioDtl = "默认：{$v['ratio']}%"; - if ($thisTurnoverRatios) { - if (I('export', 0) == 1) { - $symbol = "\n"; - } else { - $symbol = "
"; - } - foreach ($thisTurnoverRatios as $thisTurnoverRatio) { - $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥'; - $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%"; - } - } - $v['turnover_ratio_str'] = $thisRatioDtl; + $this->readTurnoverRatio($v); } + // dd($dbres); //判断导出 if(isset($_REQUEST['export'])){ $GetData = $_GET; @@ -232,7 +219,29 @@ class GameRatioMouldController extends AdminController } } return $save['turnover_ratio']; - + } + //设置比例阶梯 + protected function readTurnoverRatio(&$v){ + $turnover_ratio = json_decode($v['turnover_ratio'],true); + $v['turnover_ratio'] = array( + array("ratio"=>$v['ratio']."%","name"=>"默认比例") + ); + + foreach($turnover_ratio as $ke=>$va){ + $t=array("ratio"=>$va["ratio"]."%"); + if(array_key_exists("instanceof",$va)){ + //存在 + if($va['instanceof']=='1'){ + $t['name']="月流水≥".$va['turnover']; + }else{ + $t['name']="月流水＞".$va['turnover']; + } + }else{ + $t['name']="月流水≥".$va['turnover']; + } + $v['turnover_ratio'][]=$t; + } + $v['row'] = count($v['turnover_ratio']); } diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html index 0ad7e5e83..56374ab90 100644 --- a/Application/Admin/View/GameRatioMould/index.html +++ b/Application/Admin/View/GameRatioMould/index.html @@ -42,6 +42,9 @@ margin: 0 3px; margin-left:-7px } + tr{ + border-bottom: 1px solid #e6e6e6; + }
@@ -98,14 +101,11 @@ - 游戏类型 现包名 原包名 公司类型 - 比例分成 + 比例分成 时间 操作人 操作 @@ -121,29 +121,34 @@ - - {$data.game_type_name} - {$data.relation_game_name} - {$data.original_package_name} - {$data.company_belong} - -
- {$data.turnover_ratio_str} -
- - {$data.create_time} - {$data.admin_name} - + {$data.game_type_name} + {$data.relation_game_name} + {$data.original_package_name} + {$data.company_belong} + + {$data['turnover_ratio'][0]['name']|default="--"} + {$data['turnover_ratio'][0]['ratio']|showPercent} + + -- + -- + + {$data.create_time} + {$data.admin_name} + 修改 删除 + + + + + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent} + + + + From 94a30570134eb519463d8c204819af86af3a11a8 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 24 Jul 2020 19:44:32 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E5=88=86=E6=88=90=E6=AF=94=E4=BE=8B=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 53 ++++++----- .../GameRatioMouldController.class.php | 16 +--- .../Admin/View/CompanyGameRatio/export.html | 91 +++++++++++++++++++ .../Admin/View/CompanyGameRatio/index.html | 71 ++++++++++----- .../Admin/View/CompanyGameRatio/lists.html | 5 +- .../Admin/View/GameRatioMould/export.html | 89 ++++++++++++++++++ .../Admin/View/GameRatioMould/index.html | 25 ++++- 7 files changed, 284 insertions(+), 66 deletions(-) create mode 100644 Application/Admin/View/CompanyGameRatio/export.html create mode 100644 Application/Admin/View/GameRatioMould/export.html diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index ea93deb3d..dcd964320 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -107,47 +107,27 @@ class CompanyGameRatioController extends AdminController } $v['settlement_type'] = $this->SettlementType[$v['settlement_type']]; - - //新 - $thisTurnoverRatios = $v['turnover_ratio'] ? json_decode($v['turnover_ratio'], true) : []; - $thisRatioDtl = "默认：{$v['ratio']}%"; - if ($thisTurnoverRatios) { - - foreach ($thisTurnoverRatios as $thisTurnoverRatio) { - $thisIntervalClosedStatusText = isset($thisTurnoverRatio['instanceof']) ? ($thisTurnoverRatio['instanceof'] == 1 ? '≥' : '>') : '≥'; - $thisRatioDtl .= "{$symbol}月流水{$thisIntervalClosedStatusText}{$thisTurnoverRatio['turnover']}，比例：{$thisTurnoverRatio['ratio']}%"; - } - } - $v['turnover_ratio_str'] = $thisRatioDtl; + $this->readTurnoverRatio($v); $v['oplist'] = $this->OpAuth($v); } + $this->assign('data', $dbres); if(isset($_REQUEST['export'])){ $GetData = $_GET; unset($GetData['export']); addOperationLog(['op_type'=>3,'key'=>getNowDate(),"op_name"=>"导出",'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData)]); - - data2csv($dbres,'特殊比例申请管理',array( - "company_name"=>"公司名称", - "company_belong"=>"内外团", - "settlement_type"=>"结算周期", - "game_type_name"=>"游戏类型", - "original_package_name"=>"原游戏名称", - "relation_game_name"=>"现游戏名称", - "valid"=>"生效时间", - "turnover_ratio_str"=>"分成比例" - )); + $this->display("export"); + exit(); } $count = M("company_game_ratio","tab_")->alias('m')->field("count(m.id) count") ->join("JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id") ->join("JOIN tab_promote_company p ON ( m.company_id = p.id".$pwhere.")") ->where($where)->find()['count']; - $this->assign('data', $dbres); + $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); } - $this->assign("companyList",D("PromoteCompany")->getList()); $this->assign("gameList",D("Game")->getRelationGameLits()); $this->assign("SettlementType",$this->SettlementType); @@ -748,6 +728,29 @@ class CompanyGameRatioController extends AdminController $company_id = implode(",",$company_id); return $company_id; } + //设置比例阶梯 + protected function readTurnoverRatio(&$v){ + $turnover_ratio = json_decode($v['turnover_ratio'],true); + $v['turnover_ratio'] = array( + array("ratio"=>$v['ratio']."%","name"=>"默认比例") + ); + + foreach($turnover_ratio as $ke=>$va){ + $t=array("ratio"=>$va["ratio"]."%"); + if(array_key_exists("instanceof",$va)){ + //存在 + if($va['instanceof']=='1'){ + $t['name']="月流水≥".$va['turnover']; + }else{ + $t['name']="月流水＞".$va['turnover']; + } + }else{ + $t['name']="月流水≥".$va['turnover']; + } + $v['turnover_ratio'][]=$t; + } + $v['row'] = count($v['turnover_ratio']); + } } \ No newline at end of file diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php index f56269f05..eac5363f7 100644 --- a/Application/Admin/Controller/GameRatioMouldController.class.php +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -48,26 +48,16 @@ class GameRatioMouldController extends AdminController $v['company_belong'] ="下游".getCompanyBlong($v['company_belong']); $this->readTurnoverRatio($v); } - // dd($dbres); + $this->assign('data', $dbres); //判断导出 if(isset($_REQUEST['export'])){ $GetData = $_GET; unset($GetData['export']); addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"推广员-推广员管理-游戏分成比例模板-导出"]); - - data2csv($dbres,'游戏分成比例模板',array( - "game_type_name"=>"游戏类型", - "relation_game_name"=>"现包名", - "original_package_name"=>"原包名", - "company_belong"=>"公司类型", - "turnover_ratio_str"=>"比例分成", - "create_time"=>"时间", - "admin_name"=>"操作人" - )); + $this->display("export"); + exit(); } - $count = $this->DBModel->alias('m')->field("count(id) count")->join("INNER JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id")->where($where)->find()['count']; - $this->assign('data', $dbres); $page = set_pagination($count, $row,$params); if($page) { $this->assign('_page', $page); diff --git a/Application/Admin/View/CompanyGameRatio/export.html b/Application/Admin/View/CompanyGameRatio/export.html new file mode 100644 index 000000000..6e2ecd4fd --- /dev/null +++ b/Application/Admin/View/CompanyGameRatio/export.html @@ -0,0 +1,91 @@ + + + + + + 游戏登陆列表|----软件管理平台 + + + + + + + +
+ 导出进行中。。。
+ 如果导出成功你也可以手动关闭此页面 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
公司名称内外团结算周期游戏类型原游戏名称现游戏名称生效时间比例分成
aOh! 暂时还没有内容!
{$data.company_name}{$data.company_belong}{$data.settlement_type}{$data.game_type_name}{$data.original_package_name}{$data.relation_game_name}{$data.valid}{$data['turnover_ratio'][0]['name']|default="--"}{$data['turnover_ratio'][0]['ratio']|showPercent}----
{$game_ratio['name']|default="--"}{$game_ratio['ratio']|showPercent}
+ + + + + + \ No newline at end of file diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index b539e6bf4..931d7ec20 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -41,12 +41,11 @@ cursor:pointer } .data_list table tbody tr a.disabled,.data_list table tbody tr a.disabled:hover {color:#999;cursor:default;} - .layui-layer-title { - text-align: center; - height: 80px; - line-height: 80px; - font-weight: 600; - font-size: 18px; + .data_list table td{ + line-height: 2; + } + tr{ + border-bottom: 1px solid #e6e6e6; } @@ -154,7 +153,7 @@ 原游戏名称 现游戏名称 生效时间 - 分成比例 + 比例分成 操作 @@ -168,25 +167,37 @@ - {$data.company_name} - {$data.company_belong} - {$data.settlement_type} - {$data.game_type_name} - {$data.original_package_name} - {$data.relation_game_name} - {$data.valid} - -
- {$data.turnover_ratio_str} -
- + {$data.company_name} + {$data.company_belong} + {$data.settlement_type} + {$data.game_type_name} + {$data.original_package_name} + {$data.relation_game_name} + {$data.valid} + + {$data['turnover_ratio'][0]['name']|default="--"} + {$data['turnover_ratio'][0]['ratio']|showPercent} + + -- + -- + - + {$vo} + + + + + {$game_ratio['name']|default="--"} + {$game_ratio['ratio']|showPercent} + + + + @@ -196,8 +207,7 @@
- 导出 + 导出 {$_page|default=''}
@@ -248,6 +258,23 @@ $(function(){ $("#search").click(); } }); + $("#downloadexcel").on("click",function(){ + var url = $(this).attr("url"); + var title = '游戏特殊比例申请导出,请耐心等待数据处理....'; + var index = layer.load(2); + layer.open({ + type: 2, + title: title, + shadeClose: false, + shade: 0.8, + area: ['40%', '30%'], + content: url, + success:function(){ + layer.closeAll(); + } + + }); + }) $(".delGameRatio").on("click",function(){ var id = $(this).data("id"); diff --git a/Application/Admin/View/CompanyGameRatio/lists.html b/Application/Admin/View/CompanyGameRatio/lists.html index c6acd692e..85ef27603 100644 --- a/Application/Admin/View/CompanyGameRatio/lists.html +++ b/Application/Admin/View/CompanyGameRatio/lists.html @@ -48,6 +48,9 @@ font-weight: 600; font-size: 18px; } + .data_list table td{ + line-height: 2; + }
@@ -239,8 +242,6 @@
- 导出 {$_page|default=''}
diff --git a/Application/Admin/View/GameRatioMould/export.html b/Application/Admin/View/GameRatioMould/export.html new file mode 100644 index 000000000..0728badf2 --- /dev/null +++ b/Application/Admin/View/GameRatioMould/export.html @@ -0,0 +1,89 @@ + + + + + + 游戏登陆列表|----软件管理平台 + + + + + + + +
+ 导出进行中。。。
+ 如果导出成功你也可以手动关闭此页面 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
游戏类型现包名原包名公司类型比例分成时间操作人
aOh! 暂时还没有内容!
{$data.game_type_name}{$data.relation_game_name}{$data.original_package_name}{$data.company_belong}{$data['turnover_ratio'][0]['name']|default="--"}{$data['turnover_ratio'][0]['ratio']|showPercent}----{$data.create_time}{$data.admin_name}
{$game_ratio['name']|default="--"}{$game_ratio['ratio']|showPercent}
+ + + + + + \ No newline at end of file diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html index 56374ab90..bdb66d21b 100644 --- a/Application/Admin/View/GameRatioMould/index.html +++ b/Application/Admin/View/GameRatioMould/index.html @@ -45,6 +45,9 @@ tr{ border-bottom: 1px solid #e6e6e6; } + .data_list table td{ + line-height: 2; + }
@@ -158,10 +161,7 @@
- - 导出 - + 导出 {$_page|default=''}
@@ -211,6 +211,23 @@ $(function(){ $("#search").click(); } }); + $("#downloadexcel").on("click",function(){ + var url = $(this).attr("url"); + var title = '游戏分成比例模板,请耐心等待数据处理....'; + var index = layer.load(2); + layer.open({ + type: 2, + title: title, + shadeClose: false, + shade: 0.8, + area: ['40%', '30%'], + content: url, + success:function(){ + layer.closeAll(); + } + + }); + }) $(".ratio_del").on("click",function(){ var url = $(this).data("url"); layer.confirm('删除后将无法恢复，请慎重选择', { From 5c857840a28c5ad6a77c81026672dd05d3bee506 Mon Sep 17 00:00:00 2001 From: chenzhi Date: Fri, 24 Jul 2020 19:53:02 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E5=88=86=E6=88=90=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=9F=E6=95=88=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyGameRatioController.class.php | 4 ++-- .../Admin/View/CompanyGameRatio/lists.html | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index dcd964320..c7ddcabee 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -72,7 +72,7 @@ class CompanyGameRatioController extends AdminController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $time_start = strtotime($_REQUEST['time_start']); $time_end = strtotime($_REQUEST['time_end'])+ 86399; - $where["_string"] = "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end})"; + $where["_string"] = "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end}) OR (begin_time <= {$time_end} AND end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)"; } elseif (isset($_REQUEST['time_start'])) { $time_start = strtotime($_REQUEST['time_start']); $where["_string"] = "end_time >= {$time_start} OR end_time = 0"; @@ -183,7 +183,7 @@ class CompanyGameRatioController extends AdminController if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { $time_start = strtotime($_REQUEST['time_start']); $time_end = strtotime($_REQUEST['time_end'])+ 86399; - $where["_string"] = "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end})"; + $where["_string"] = "(begin_time BETWEEN {$time_start} AND {$time_end}) OR (end_time BETWEEN {$time_start} AND {$time_end}) OR (begin_time <= {$time_end} AND end_time >= {$time_end}) OR (begin_time >0 AND end_time = 0)"; } elseif (isset($_REQUEST['time_start'])) { $time_start = strtotime($_REQUEST['time_start']); $where["_string"] = "end_time >= {$time_start} OR end_time = 0"; diff --git a/Application/Admin/View/CompanyGameRatio/lists.html b/Application/Admin/View/CompanyGameRatio/lists.html index 85ef27603..d2e976aea 100644 --- a/Application/Admin/View/CompanyGameRatio/lists.html +++ b/Application/Admin/View/CompanyGameRatio/lists.html @@ -123,6 +123,15 @@
+ +
+ +  -  +
+ + +
+
搜索 @@ -267,6 +276,7 @@ $(".select_gallery").select2(); + - diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html index 85cf38c72..b3851e34c 100644 --- a/Application/Admin/View/PromoteCompany/edit.html +++ b/Application/Admin/View/PromoteCompany/edit.html @@ -97,12 +97,6 @@ - - 推广游戏： - - 编辑 - - *团体归属: @@ -436,69 +430,7 @@
- + - diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html index 968d9adbc..b53da20de 100644 --- a/Application/Admin/View/PromoteCompany/lists.html +++ b/Application/Admin/View/PromoteCompany/lists.html @@ -365,60 +365,70 @@
{$_page|default=''}
-