diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index b2ede411d..4d325d7ce 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -255,7 +255,7 @@ class CompanyGameRatioController extends AdminController } $this->ajaxReturn(array( 'status' => 1, - "info"=>"市场部审核通过成功" + "info"=>"管理员审核通过成功" )); } @@ -384,7 +384,7 @@ class CompanyGameRatioController extends AdminController "marketAgree"=>"市场部审批通过", "marketRefuse"=>"市场部审核拒绝", "adminAgree"=>"管理员审核通过", - "adminRefuse"=>"管理员审核拒绝" + "adminRefuse"=>"管理员审核拒绝" ]; $resarr = []; foreach ($mentBtn as $k => $v) { diff --git a/Application/Admin/Controller/CompanyRelationController.class.php b/Application/Admin/Controller/CompanyRelationController.class.php index 713ab696d..84355f2e8 100644 --- a/Application/Admin/Controller/CompanyRelationController.class.php +++ b/Application/Admin/Controller/CompanyRelationController.class.php @@ -162,17 +162,108 @@ class CompanyRelationController extends AdminController } public function marketAgree(){ - + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select(); + foreach($dbres as $k=>&$v){ + if($v['status'] != 0) continue; + $v['verify_log'] = json_decode($v['verify_log'],true); + $v['verify_log']['market_user']=$this->admininfo["username"]; + $v['verify_log']['market_time']=date("Y-m-d H:i:s"); + $v['verify_log'] = json_encode($v['verify_log']); + $v['status']=1; + $this->DBlogModel->save($v); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + } + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"市场部审核通过成功" + )); } public function marketRefuse(){ - + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select(); + foreach($dbres as $k=>&$v){ + if($v['status'] != 0) continue; + $v['verify_log'] = json_decode($v['verify_log'],true); + $v['verify_log']['market_user']=$this->admininfo["username"]; + $v['verify_log']['market_time']=date("Y-m-d H:i:s"); + $v['verify_log'] = json_encode($v['verify_log']); + $v['status']=-1; + $this->DBlogModel->save($v); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"市场部审核",'url'=>U('index')]); + } + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"市场部审核拒绝成功" + )); } public function adminRefuse(){ - + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $dbres = $this->DBlogModel->field("id,status,verify_log")->where("id in ({$ids})")->select(); + foreach($dbres as $k=>&$v){ + if($v['status'] != 1) continue; + $v['verify_log'] = json_decode($v['verify_log'],true); + $v['verify_log']['admin_user']=$this->admininfo["username"]; + $v['verify_log']['admin_time']=date("Y-m-d H:i:s"); + $v['verify_log'] = json_encode($v['verify_log']); + $v['status']=-2; + $this->DBlogModel->save($v); + addOperationLog(['op_type'=>1,'key'=>$v['id'],"op_name"=>"管理员审核",'url'=>U('index')]); + } + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"管理员审核拒绝成功" + )); } //管理员成功 public function adminAgree(){ - + if(!isset($_REQUEST['ids'])) $this->error("参数错误"); + $ids = $_REQUEST['ids']; + $dbres = $this->DBlogModel->field("*")->where("id in ({$ids})")->select(); + foreach($dbres as $k=>&$v){ + if($v['status'] != 1) continue; + $v['verify_log'] = json_decode($v['verify_log'],true); + $v['verify_log']['admin_user']=$this->admininfo["username"]; + $v['verify_log']['admin_time']=date("Y-m-d H:i:s"); + $v['verify_log'] = json_encode($v['verify_log']); + $v['status']=2; + $this->DBlogModel->save($v); + $id = $v['id']; + //保存到其他表 + //查找是否存在 + unset($v['id']); + unset($v['remark']); + unset($v['status']); + unset($v['verify_log']); + $where = " + ( + (first_company_type ='{$v['first_company_type']}' and first_company_id = '{$v['first_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']}') + ) + "; + $hasdb = $this->DBModel->where($where)->find(); + if(isset($hasdb['id'])){ + $v['id'] = $hasdb['id']; + $this->DBModel->save($v); + }else{ + $this->DBModel->add($v); + } + addOperationLog(['op_type'=>1,'key'=>$id,"op_name"=>"管理员审核",'url'=>U('index')]); + } + $this->ajaxReturn(array( + 'status' => 1, + "info"=>"管理员审核通过成功" + )); } public function addRelation() @@ -264,7 +355,7 @@ class CompanyRelationController extends AdminController "marketAgree"=>"市场部审批通过", "marketRefuse"=>"市场部审核拒绝", "adminAgree"=>"管理员审核通过", - "adminRefuse"=>"管理员审核拒绝" + "adminRefuse"=>"管理员审核拒绝" ]; $resarr = []; foreach ($mentBtn as $k => $v) { diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index b4d48f323..0856cddcb 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -288,7 +288,7 @@ $(function(){ }); }) - $("#marketAgree,#marketRefuse,#adminAgree").on("click",function(){ + $("#marketAgree,#marketRefuse,#adminAgree,#adminRefuse").on("click",function(){ var id = $(this).attr("id"); if(id == "marketAgree"){ var opname = "市场部审批通过"; diff --git a/Application/Admin/View/CompanyRelation/lists.html b/Application/Admin/View/CompanyRelation/lists.html index 33688d0d2..c02b3f190 100644 --- a/Application/Admin/View/CompanyRelation/lists.html +++ b/Application/Admin/View/CompanyRelation/lists.html @@ -316,7 +316,7 @@ $(function(){ }); }) - $("#marketAgree,#marketRefuse,#adminAgree").on("click",function(){ + $("#marketAgree,#marketRefuse,#adminAgree,#adminRefuse").on("click",function(){ var id = $(this).attr("id"); if(id == "marketAgree"){ var opname = "市场部审批通过";