diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php index a05e905ce..d4051eb39 100644 --- a/Application/Admin/Common/extend.php +++ b/Application/Admin/Common/extend.php @@ -2195,7 +2195,8 @@ function a_array_unique($array){ ["id"=>0,'name'=>"内团"], ["id"=>1,'name'=>"外团"], ["id"=>2,'name'=>"外团-分发"], - ["id"=>3,'name'=>"无"] + ["id"=>3,'name'=>"无"], + ["id"=>4,'name'=>"聚合"], ); if($id > -1){ foreach($data as $k=>$v){ diff --git a/Application/Admin/Controller/GameRatioMouldController.class.php b/Application/Admin/Controller/GameRatioMouldController.class.php new file mode 100644 index 000000000..d09f84296 --- /dev/null +++ b/Application/Admin/Controller/GameRatioMouldController.class.php @@ -0,0 +1,62 @@ +display(); + } + + public function add() + { + + if ($_POST) { + $params = I('post.'); + addOperationLog(['op_type'=>1,'key'=>getPromoteName($promoteGameRatio['promote_id']).'/'.getrelationGameName($promoteGameRatio['game_id']),'op_name'=>'修改游戏分成比例申请','url'=>U('PromoteGameRatio/applyRatio',['id'=>$promoteGameRatio['id']]),'menu'=>'推广员-结算单管理-公会分成管理']); + $this->success('保存成功', U('lists')); + } else { + $game_type = M("game_type","tab_")->field("id,type_name")->where("status=1")->select(); + $this->assign("game_type",$game_type); + //渠道类型 + $this->assign("company_belong",getCompanyBlong()); + + + $params = I('get.'); + $id = $params['id'] ?? 0; + $id = intval($id); + $companyId = 0; + $metaTitle = '游戏分成比例申请'; + + $this->display(); + } + } + public function edit() + { + if ($_POST) { + $params = I('post.'); + addOperationLog(['op_type'=>1,'key'=>getPromoteName($promoteGameRatio['promote_id']).'/'.getrelationGameName($promoteGameRatio['game_id']),'op_name'=>'修改游戏分成比例申请','url'=>U('PromoteGameRatio/applyRatio',['id'=>$promoteGameRatio['id']]),'menu'=>'推广员-结算单管理-公会分成管理']); + $this->success('保存成功', U('lists')); + } else { + $params = I('get.'); + $id = $params['id'] ?? 0; + $id = intval($id); + $companyId = 0; + $metaTitle = '游戏分成比例申请'; + + $this->display(); + } + } + //基础信息获取 + public function getGames() + { + $level = 1; + $gameTypeId = intval(I('game_type_id', 0)); + $games = M("game","tab_")->field("relation_game_id,relation_game_name,original_package_name")->where("game_type_id = '{$gameTypeId}'")->group("relation_game_name")->select(); + $this->ajaxReturn($games); + } + + +} \ No newline at end of file diff --git a/Application/Admin/View/GameRatioMould/add.html b/Application/Admin/View/GameRatioMould/add.html new file mode 100644 index 000000000..e40a1ecb8 --- /dev/null +++ b/Application/Admin/View/GameRatioMould/add.html @@ -0,0 +1,459 @@ + + + + + + + + + + + + +
+

{$meta_title}

+ +
+ + +
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
*游戏类型: + + +
*现包名： + +
原包名： + 请先选择游戏 + +
*公司类型: + +
*分成比例设定: + + + % + 当前需要修改成的分成比例 +
+
+
+ + + + +
+
+ +
+
+ + +
+ + + 返回 + +
+
+
+
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + if(C('COLOR_STYLE')=='blue_color') echo ''; + + + + + + + diff --git a/Application/Admin/View/GameRatioMould/index.html b/Application/Admin/View/GameRatioMould/index.html new file mode 100644 index 000000000..f53d797c6 --- /dev/null +++ b/Application/Admin/View/GameRatioMould/index.html @@ -0,0 +1,388 @@ + + + + + + + + + + + + + +
+
+

游戏分成比例模板

+

说明：编辑将修改未设置特定比例的符合条件的游戏和渠道关系分成比例

+
+
+
+ + 游戏分成比例申请 + + 审核通过 + 审核拒绝 + + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ 搜索 +
+
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 会长ID会长账号手机号码注册时间状态身份状态推广公司工会归属已申请游戏游戏类型原分成比例公会阶梯比例详细信息开始时间备注分成比例审核申请人确认人操作
aOh! 暂时还没有内容!
+ + + + + + {$record.promote_id}{$record.promote_account}{$record.promote_mobile_phone}{$record.promote_create_time}{$record.promote_status_text}{$record.promote_ver_status_text}{$record.company_name}{$record.company_belong}{$record.game_name}{$record.game_type_name}{$record.last_ratio} +
+ {$record.ratio_dtl} +
+ 		{$record.valid_date}{$record.remark}{$record.status_text}{$record.applicant}{$record.reviewer} + 修改 +
+
+ +
+ +
+ + 导出 + + {$_page|default=''} +
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + +
+
+
    +
  1. +
    + 备注: + +
    +
    拒绝
     +
    2. +
+
+
+ + + + + + + diff --git a/Data/update.sql b/Data/update.sql index 54a7f8f23..77c30614c 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -1750,6 +1750,8 @@ ALTER TABLE `tab_deposit` ADD COLUMN `old_change_promote_id` int(11) NULL DEFAULT 0 COMMENT '修改配置前渠道' , ADD COLUMN `old_change_promote_account` varchar(30) NULL COMMENT '修改配置前渠道账号' ; +--20200518 chenzhi + --新增支付宝打款配置项 INSERT INTO `tab_tool` (`name`,`title`, `config`,`type`, `status`, `create_time`) VALUES ('transfer_set', '支付宝打款设置','{"user_id":"","user_num":"","phone":"","type":"1","typestr":"支付宝"}', '1', '1','1589270284'); @@ -1765,3 +1767,19 @@ CHANGE COLUMN `promote_id` `company_id` int(11) NOT NULL DEFAULT 0 COMMENT '下 ALTER TABLE `tab_promote_game_ratio_log` CHANGE COLUMN `promote_id` `company_id` int(11) NOT NULL DEFAULT 0 COMMENT '下游推广公司id' AFTER `id`; + +--新增游戏分成模板 +CREATE TABLE `tab_game_ratio_mould` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `relation_game_id` int(11) DEFAULT '0' COMMENT '游戏id', + `company_belong` varchar(60) NOT NULL COMMENT '工会归属：0-内团 1-外团 2-分发联盟 3-无 4-下游聚合', + `ratio` decimal(5,2) NOT NULL DEFAULT '0.00' COMMENT '默认分成比例', + `turnover_ratio` varchar(2000) COLLATE utf8mb4_bin NOT NULL DEFAULT '' COMMENT '流水分成比例= turnover:流水,ratio:比例,instanceof:1>= || 2>', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间/修改时间', + `admin_id`int(11) DEFAULT '0' COMMENT '操作人id', + `admin_name` varchar(60) NOT NULL COMMENT '操作人名称', + PRIMARY KEY (`id`), + KEY `game_id` (`relation_game_id`) USING BTREE, + KEY `company_belong` (`company_belong`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='游戏默认分成比例'; +