From 61bfbd00cc2f516d37443489870eeb5beecef446 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 16 Dec 2019 19:36:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteGameRatioController.class.php      | 16 ++++++++++++++
 .../Model/PromoteGameRatioModel.class.php     |  8 +++++++
 Data/update.sql                               | 21 ++++++++++++++++++-
 3 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 Application/Admin/Controller/PromoteGameRatioController.class.php
 create mode 100644 Application/Admin/Model/PromoteGameRatioModel.class.php

diff --git a/Application/Admin/Controller/PromoteGameRatioController.class.php b/Application/Admin/Controller/PromoteGameRatioController.class.php
new file mode 100644
index 000000000..3e9105e12
--- /dev/null
+++ b/Application/Admin/Controller/PromoteGameRatioController.class.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Admin\Controller;
+
+use Think\Controller;
+
+class PromoteGameRatioController extends ThinkController
+{
+    public function lists()
+    {
+        $params = I('get.');
+        $promoteAccount = $params['promote_account'] ?? '';
+        $gameId = $params['game_id'] ?? 0;
+        $status = $params['status'] ?? '';
+    }
+}
\ No newline at end of file
diff --git a/Application/Admin/Model/PromoteGameRatioModel.class.php b/Application/Admin/Model/PromoteGameRatioModel.class.php
new file mode 100644
index 000000000..715ec4169
--- /dev/null
+++ b/Application/Admin/Model/PromoteGameRatioModel.class.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Admin\Model;
+
+class PromoteGameRatioModel
+{
+
+}
\ No newline at end of file
diff --git a/Data/update.sql b/Data/update.sql
index bf24fab5d..b27e6a430 100644
--- a/Data/update.sql
+++ b/Data/update.sql
@@ -724,4 +724,23 @@ INSERT INTO `sys_menu`(`title`, `pid`, `sort`, `url`, `hide`, `tip`, `group`, `i
 --2019-12-13
 --游戏添加落地页视频封面
 ALTER TABLE `tab_game`
-ADD COLUMN `flooring_page_video_cover` int(11) NOT NULL DEFAULT 0 COMMENT '落地页视频封面';
\ No newline at end of file
+ADD COLUMN `flooring_page_video_cover` int(11) NOT NULL DEFAULT 0 COMMENT '落地页视频封面';
+
+--2019-12-16
+--公会分成比例管理
+CREATE TABLE `tab_promote_game_ratio`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `promote_id` int(11) NOT NULL DEFAULT 0 COMMENT '推广员id',
+  `game_id` int(11) NOT NULL DEFAULT 0 COMMENT '游戏id',
+  `ratio` decimal(5, 2) NOT NULL DEFAULT 0 COMMENT '分成比例',
+  `begin_time` int(10) NOT NULL DEFAULT 0 COMMENT '开始时间',
+  `end_time` int(10) NOT NULL DEFAULT 0 COMMENT '过期时间',
+  `remark` varchar(255) NOT NULL COMMENT '备注',
+  `status` tinyint(3) NOT NULL DEFAULT 0 COMMENT '审核状态：-1-未通过 0-待审核 1-通过',
+  `applicant_id` int(11) NOT NULL DEFAULT 0 COMMENT '申请人',
+  `reviewer_id` int(11) NOT NULL DEFAULT 0 COMMENT '审核人',
+  `create_time` int(10) NOT NULL DEFAULT 0 COMMENT '创建时间',
+  `update_time` int(10) NOT NULL DEFAULT 0 COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  INDEX `promote_id`(`promote_id`, `game_id`, `status`) USING BTREE
+);
\ No newline at end of file

From 39f068ebbea4c71402ca719832e4a8a8772a1d31 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Mon, 16 Dec 2019 20:16:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=AE=A1=E7=90=86>=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E7=8E=A9=E5=AE=B6--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/View/default/Query/userRecharges.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Application/Home/View/default/Query/userRecharges.html b/Application/Home/View/default/Query/userRecharges.html
index 5fedd4150..541918ba3 100644
--- a/Application/Home/View/default/Query/userRecharges.html
+++ b/Application/Home/View/default/Query/userRecharges.html
@@ -159,7 +159,7 @@
                     <i class="iconfont iconsort"></i>
                   </if>
                 </th>
-                <th class="sort" sort-name="create_time" class="title-cursor-pointer" title="账号所注册的时间">注册时间
+                <th class="sort" sort-name="create_time" class="title-cursor-pointer" title="角色创建的时间">注册时间
                   <if condition="'create_time' == I('sort_name', '')">
                     <if condition="1 == $sort">
                       <i class="iconfont iconsort-down"></i>