diff --git a/Application/Admin/Controller/CompanyGameRatioController.class.php b/Application/Admin/Controller/CompanyGameRatioController.class.php index fdb11c916..5baecd715 100644 --- a/Application/Admin/Controller/CompanyGameRatioController.class.php +++ b/Application/Admin/Controller/CompanyGameRatioController.class.php @@ -259,7 +259,7 @@ class CompanyGameRatioController extends AdminController )); } - public function add() + public function addRatio() { if ($_POST) { $params = I('post.'); @@ -308,17 +308,77 @@ class CompanyGameRatioController extends AdminController } } - public function edit() + public function editRatio() { - + if ($_POST) { + $params = I('post.'); + if(!isset($params['id'])){ + $this->error('参数错误'); + } + if (empty($params['begin_time'])) { + $this->error('请选择开始时间'); + } + if (!empty($params['end_time'])) { + if (strtotime($params['end_time']) < strtotime($params['begin_time'])) { + $this->error('结束时间不得小于开始时间'); + } + } + if (!isset($params['ratio']) || $params['ratio'] === '') { + $this->error('默认分成比例不能为空'); + } + //查询 + $y = M("company_game_ratio_log","tab_")->where("id='{$params['id']}'")->find(); + $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'] ?? ''; + if($y['ratio'] != $save['ratio'] || $y['turnover_ratio'] != $save['turnover_ratio'] || $y['begin_time'] != $save['begin_time'] || $y['end_time'] != $save['end_time']){ + $save['status'] = 0; + $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")]); + } else { + $params = I('get.'); + $id = $params['id'] ?? 0; + $id = intval($id); + $map['m.id'] = $id; + + $gameres = M("game","tab_")->field("tab_game.relation_game_id,tab_game.relation_game_name,IF(tab_game.original_package_name='','未配置',tab_game.original_package_name) original_package_name,tab_game_type.type_name game_type_name")->join("tab_game_type on tab_game.game_type_id = tab_game_type.id")->group("tab_game.relation_game_id")->select(false); + $dbres = M("company_game_ratio_log","tab_") + ->alias('m') + ->field("m.*,g.*,p.company_name,p.company_belong") + ->join("left JOIN ({$gameres}) g ON m.relation_game_id = g.relation_game_id") + ->join("left JOIN tab_promote_company p ON m.company_id = p.id") + ->where($map) + ->find(); + $dbres['turnover_ratio'] = $dbres['turnover_ratio'] ? json_decode($dbres['turnover_ratio'], true) : $dbres['turnover_ratio']; + $dbres['begin_time'] = date("Y-m-d",$dbres['begin_time']); + $dbres['end_time'] = empty($dbres['end_time']) ? '' :date("Y-m-d",$dbres['end_time']); + $this->assign('data', $dbres); + $this->display(); + } } - public function del() + public function delRatio() { - + if(!isset($_REQUEST['id'])){ + $this->error('参数错误'); + } + $id = $_REQUEST['id']; + $res = M("company_game_ratio_log","tab_")->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 menuAuth() { - $addurl = U("add"); + $addurl = U("addRatio"); $mentBtn = [ "addRatio"=>"新增推广游戏分成", "marketAgree"=>"市场部审批通过", @@ -455,6 +515,12 @@ class CompanyGameRatioController extends AdminController return ; } + public function error($data) + { + header('Content-Type:application/json; charset=utf-8'); + $data =json_encode(['msg'=>$data,"code"=>4000],JSON_UNESCAPED_UNICODE); + exit($data); + } } \ No newline at end of file diff --git a/Application/Admin/View/CompanyGameRatio/add.html b/Application/Admin/View/CompanyGameRatio/addRatio.html similarity index 99% rename from Application/Admin/View/CompanyGameRatio/add.html rename to Application/Admin/View/CompanyGameRatio/addRatio.html index 8e5bb21c3..190065b0b 100644 --- a/Application/Admin/View/CompanyGameRatio/add.html +++ b/Application/Admin/View/CompanyGameRatio/addRatio.html @@ -95,7 +95,7 @@
-
+
diff --git a/Application/Admin/View/CompanyGameRatio/edit.html b/Application/Admin/View/CompanyGameRatio/editRatio.html similarity index 87% rename from Application/Admin/View/CompanyGameRatio/edit.html rename to Application/Admin/View/CompanyGameRatio/editRatio.html index 85aeba38a..ddc68ed9c 100644 --- a/Application/Admin/View/CompanyGameRatio/edit.html +++ b/Application/Admin/View/CompanyGameRatio/editRatio.html @@ -87,23 +87,23 @@ }
-

编辑游戏分成比例模板

- +

特殊比例申请修改

+

说明：除了备注其他项的修改将会重走审批流程，若不需要修改请点击返回

- +
- + @@ -121,13 +121,7 @@ - - - - + + + + + + + + + +
游戏类型:推广公司: - {$data.game_type_name} + {$data.company_name}
公司类型: - 下游{$data.company_belong} - -
*分成比例设定: @@ -170,6 +164,25 @@
*生效期限: +
+ + - + +
+ 结束时间不填则默认永久。 +
备注： + + +
@@ -211,60 +224,18 @@ highlight_subnav("{:U('GameRatioMould/index')}"); $(".select_gallery").select2(); $(function(){ - $('.time').datetimepicker({ - format: 'yyyy-mm', - language: "zh-CN", - autoclose: true, - scrollMonth: false, - scrollTime: false, - scrollInput: false, - startView: 'year', - minView:'year', - maxView:'year', + $('.time').datetimepicker({ + format: 'yyyy-mm-dd', + language: "zh-CN", + minView: 2, + autoclose: true }); - showTab(); var promoteGameRatioData = {}; promoteGameRatioData.ratio = '0.00'; promoteGameRatioData.begin_time = ''; promoteGameRatioData.end_time = ''; promoteGameRatioData.remark = ''; - - $('#game_type_id').change(function (e) { - var game_type_id = parseInt($(this).val()); - $.ajax({ - type: 'post', - url: "{:U('getGames')}", - dataType: 'json', - data: {'game_type_id': game_type_id}, - success: function (data) { - var html = ''; - if (data.length > 0) { - for (let i = 0;i < data.length;i++) { - html += ''; - } - } - $('#relation_game_id').html(html); - $('#relation_game_id').select2(); - // getPromoteGameRatio(); - }, - error: function (result) { - console.log(result); - } - }); - }); - - $('#relation_game_id').change(function (e) { - var original_package_name = $('#relation_game_id option:selected').data("original"); - if(original_package_name == ''){ - original_package_name = '未配置原包名' - } - $("#original_package_name").html(original_package_name); - }); - - - - $('#ratio, #begin_time, #end_time, #remark').change(function () { var val = $(this).val(); var elementIdName = $(this).attr('id'); @@ -277,7 +248,10 @@ $(function(){ //查看是否报错 var flag = true; var obj = { - "ratio":["number","默认比例必须是大于0的数字"] + "ratio":["number","默认比例必须是大于0的数字"], + "begin_time":["date","开始时间不能为空"], + "end_time":["nocheck"], + "remark":["nocheck",'',"textarea"] } var cres = CIC.checkAddInput(obj); if(!cres){ diff --git a/Application/Admin/View/CompanyGameRatio/index.html b/Application/Admin/View/CompanyGameRatio/index.html index a3f5a073a..b4d48f323 100644 --- a/Application/Admin/View/CompanyGameRatio/index.html +++ b/Application/Admin/View/CompanyGameRatio/index.html @@ -260,24 +260,31 @@ $(function(){ $("#search").click(); } }); - - $(".ratio_del").on("click",function(){ - var url = $(this).data("url"); + $(".editRatio").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('editRatio')}"+"&id="+id; + window.location.href = url; + }) + $(".delRatio").on("click",function(){ + var id = $(this).data("id"); + var url = "{:U('delRatio')}"+"&id="+id; layer.confirm('删除后将无法恢复，请慎重选择', { - 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}); - } - }); + 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}); + } + }); }); }) diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html index 080fe6302..1032af6d8 100644 --- a/Application/Admin/View/GameRatioMould/index.html +++ b/Application/Admin/View/GameRatioMould/index.html @@ -209,6 +209,8 @@ $(function(){ $(".ratio_del").on("click",function(){ var url = $(this).data("url"); layer.confirm('删除后将无法恢复，请慎重选择', { + closeBtn:0, + title:false, btn: ['取消','删除'] //按钮 }, function(index){ layer.close(index);