From 747c97ceec90e102b535a79d4862fb8147b60c8b Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 3 Dec 2019 18:47:27 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index f505a8857..fff5f82d7 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -259,28 +259,21 @@ class PromoteController extends BaseController $whereUser['promote_id'] = ['IN', $promoteId]; - if ($type == 1) { - $pay_time = total(1); - $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); - $end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1; - $whereUser['register_time'] = ['between', array($start, $end - 1)]; - $userId = M('user', 'tab_')->field('id')->where($whereUser)->select(); - - } else if ($type == 2) { - $pay_time = total(3); - $start = mktime(0, 0, 0, date('m'), 1, date('Y')); - $end = mktime(0, 0, 0, date('m') + 1, 1, date('Y')) - 1; + if (in_array($type, [1, 2])) { + if ($type == 1) { + $pay_time = total(1); + $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); + $end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1; + } else { + $pay_time = total(3); + $start = mktime(0, 0, 0, date('m'), 1, date('Y')); + $end = mktime(0, 0, 0, date('m') + 1, 1, date('Y')) - 1; + } $whereUser['register_time'] = ['between', array($start, $end - 1)]; - $userId = M('user', 'tab_')->field('id')->where($whereUser)->select(); + $userId = M('user', 'tab_')->where($whereUser)->getField('id', true); } -// if ($userId) { -// var_dump($userId); -// } if ($userId) { - - $userId = implode(',', array_column($userId, 'id')); -// var_dump($userId); $map1['user_id'] = $map['user_id'] = ['IN', $userId]; } else if (!$userId && $type != 0) { return array('sum_mounth' => 0, 'sum_today' => 0); @@ -333,9 +326,6 @@ class PromoteController extends BaseController } $data[] = $dbdata; } -// if ($userId) { -// echo $spend->_sql();die(); -// } foreach ($data as $key => $value) { $value['count'] ?: 0; $value['today'] ?: 0; @@ -353,8 +343,6 @@ class PromoteController extends BaseController $total = $this->data_total($data); return $total; -// - } public function data_total($data) From 34b53c4ec18bfbfa01732113919e159e29d16a43 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Wed, 4 Dec 2019 10:54:38 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=90=88=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 653bf0c53..c5e747409 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -1639,10 +1639,10 @@ class DownloadController extends BaseController { $nowTime = date('Y-m-d'); $begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $endtime1 = $nowTime; - $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]]; + $map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1) + 3600*24]]; } if(!empty($begtime) && !empty($endtime)) { - $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24 -1]]; + $map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime) + 3600 * 24]]; } $serverField = ''; $serverJoin = ''; @@ -1841,12 +1841,12 @@ class DownloadController extends BaseController { $begTime = strtotime($initBegTime); $endTime = strtotime($initEndTime); $params['begin_time'] = $begTime; - $params['end_time'] = $endTime +3600 * 24 -1; + $params['end_time'] = $endTime -1; if(!empty($map['apply_time'][1])) { $begTime = $map['apply_time'][1][0]; $endTime = $map['apply_time'][1][1]; $params['begin_time'] = $begTime; - $params['end_time'] = $endTime + 3600 * 24 -1; + $params['end_time'] = $endTime -1; unset($map['apply_time']); } if(!empty($map['tab_server.server_id'])) { From 1c83185aaf5aaf4d9ffba453175dfc3d6f5400e2 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 4 Dec 2019 12:03:35 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From e8a4da70cc8231510e4c6ffcccc45d24e5e63545 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 4 Dec 2019 14:33:38 +0800 Subject: [PATCH 04/20] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0->?= =?UTF-8?q?=E9=A6=96=E9=A1=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 122 +++++++----------- 1 file changed, 46 insertions(+), 76 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index fff5f82d7..b718673a8 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -240,26 +240,25 @@ class PromoteController extends BaseController private function caculateSpend($pay_time, $condition, $create = [], $type = 0) { - $map1['promote_id'] = $map['promote_id'] = array('egt', 0); + $map['promote_id'] = array('egt', 0); $spend = M('Spend', 'tab_'); - $map1['pay_status'] = $map['pay_status'] = 1; + $map['pay_status'] = 1; $today = total(1); $yesterday = total(5); $week = total(2); $mounth = total(3); - unset( $map['create_time']); + $this->getLoginPromote(); - $promote_id = get_pid(); - - $promoteId = M("promote", "tab_") - ->field("id") - ->where(array('chain' => ['like', '/'.$promote_id . '/%'],'id'=>$promote_id,'_logic'=>'or')) - ->select(); - $promoteId = implode(',',array_column($promoteId,'id')); + $promoteId = $this->loginPromote['id']; - $whereUser['promote_id'] = ['IN', $promoteId]; + $promoteIds = M("promote", "tab_") + ->where(array('chain' => ['like', $this->loginPromote['chain'] . $promoteId . '/%'])) + ->getField('id', true); + $promoteIds[] = $promoteId; + $map['promote_id'] = ['IN', $promoteIds]; if (in_array($type, [1, 2])) { + $whereUser['promote_id'] = $map['promote_id']; if ($type == 1) { $pay_time = total(1); $start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); @@ -271,78 +270,49 @@ class PromoteController extends BaseController } $whereUser['register_time'] = ['between', array($start, $end - 1)]; $userId = M('user', 'tab_')->where($whereUser)->getField('id', true); - } - if ($userId) { - $map1['user_id'] = $map['user_id'] = ['IN', $userId]; - } else if (!$userId && $type != 0) { - return array('sum_mounth' => 0, 'sum_today' => 0); + if ($userId) { + $map['user_id'] = ['IN', $userId]; + } else if (!$userId && $type != 0) { + return array('sum_mounth' => 0, 'sum_today' => 0); + } } - //获取所有会长 - $promote_map = "`chain` = '%/{$promote_id}/%' OR id = {$promote_id}"; - - $promote = M("promote","tab_")->field("id,account")->where($promote_map)->select(); - $data =array(); - for ($i=0; $i < count($promote); $i++) { - # code... - $proid = M("promote","tab_")->field("id")->where("`chain` like '%/{$promote[$i]['id']}/%'")->select(); - $str = ''; - for($k=0; $kfield(' - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count, - floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today, + $data = $spend + ->field(' + floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as sum_count, + floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as sum_today, floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100) as yesterday, - floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week, - floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') - ->where($map) - ->where("pay_time".$pay_time) - ->find(); - $dbdata['promote_account'] = $promote[$i]['account']; - } else { - $dbdata = $spend - ->field(' - floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as count, - floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as today, + floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as sum_week, + floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as sum_mounth') + ->where($map) + ->where("pay_time".$pay_time) + ->find(); + } else { + $data = $spend + ->field(' + floor(sum(IF(pay_time ' . $pay_time . ',pay_amount,0))*100) as sum_count, + floor(sum(IF(pay_time ' . $today . ',pay_amount,0))*100) as sum_today, floor(sum(IF(pay_time ' . $yesterday . ',pay_amount,0))*100) as yesterday, - floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as week, - floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as mounth') - ->where($map) - ->where("pay_time".$pay_time) - ->find(); - $dbdata['promote_account'] = $promote[$i]['account']; - } - $data[] = $dbdata; - } - foreach ($data as $key => $value) { - $value['count'] ?: 0; - $value['today'] ?: 0; - $value['week'] ?: 0; - $value['mounth'] ?: 0; - static $i = 0; - $i++; - $data[$key]['rand'] = $i; - $data[$key]['count'] = $value['count'] / 100; - $data[$key]['today'] = $value['today'] / 100; - $data[$key]['yesterday'] = $value['yesterday'] / 100; - $data[$key]['week'] = $value['week'] / 100; - $data[$key]['mounth'] = $value['mounth'] / 100; - } - $total = $this->data_total($data); + floor(sum(IF(pay_time ' . $week . ',pay_amount,0))*100) as sum_week, + floor(sum(IF(pay_time ' . $mounth . ',pay_amount,0))*100) as sum_mounth') + ->where($map) + ->where("pay_time".$pay_time) + ->find(); + } + $data['sum_count'] = empty($data['sum_count']) ? 0 : bcdiv($data['sum_count'], 100 ,2); + $data['sum_today'] = empty($data['sum_today']) ? 0 : bcdiv($data['sum_today'], 100 ,2); + $data['yesterday'] = empty($data['yesterday']) ? 0 : bcdiv($data['yesterday'], 100 ,2); + $data['sum_week'] = empty($data['sum_week']) ? 0 : bcdiv($data['sum_week'], 100 ,2); + $data['sum_mounth'] = empty($data['sum_mounth']) ? 0 : bcdiv($data['sum_mounth'], 100 ,2); - return $total; + return $data; } public function data_total($data) From 84fc4e367b0e88c55c11cab2de45a6d674a36d49 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Fri, 6 Dec 2019 10:04:06 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 1a8be9429c68ad723e043b34d3dff7bbb6a999b7 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 6 Dec 2019 14:33:16 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From 9c3b872cb9d19c704391277cc35481655e435738 Mon Sep 17 00:00:00 2001 From: "elf@home" <360197197@qq.com> Date: Sat, 7 Dec 2019 00:01:51 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 7bcbb6c9d1398086646c013cfc254ab6a1d359a9 Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Mon, 9 Dec 2019 14:26:10 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/DownloadController.class.php | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 8b6c93ea7..c39f5d109 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -36,6 +36,11 @@ class DownloadController extends BaseController { 1 => '汇款中', 2 => '已汇款', ]; + + public static $payStatus = [ + 0 => '下单未支付', + 1 => '充值成功', + ]; /** * excel @@ -1204,9 +1209,15 @@ class DownloadController extends BaseController { empty(I('game_player_name')) || $map['tab_spend.game_player_name'] = ['like', '%' . I('game_player_name') . '%']; empty(I('user_account')) || $map['tab_spend.user_account'] = ['like', '%' . I('user_account') . '%']; empty(I('pay_order_number')) || $map['tab_spend.pay_order_number'] = I('pay_order_number'); - $map['tab_spend.pay_status'] = 1; + // $map['tab_spend.pay_status'] = 1; $map['tab_spend.is_check'] = ['neq', 2]; - + if (isset($_REQUEST['pay_status']) && $_REQUEST['pay_status'] !== '') { + $payStatus = intval(I('pay_status')); + + if (in_array($payStatus, array_keys(self::$payStatus))) { + $map['tab_spend.pay_status'] = $payStatus; + } + } $conditions = json_encode($map,TRUE); $addtime = time(); $data = [ @@ -3114,7 +3125,9 @@ class DownloadController extends BaseController { '游戏订单', '订单金额', '支付方式', + '充值状态', '游戏名称', + '设备类型', '区服', '角色名', '部门长', @@ -3184,6 +3197,8 @@ class DownloadController extends BaseController { // $value1['user_account'] = substr_replace($value1['user_account'],'************',3,12); $value1['user_account'] = $this->encryption($value1['user_account']); $value1['pay_order_number'] = $this->encryption($value1['pay_order_number']); + $value1['pay_status'] = isset(self::$payStatus[$value1['pay_status']]) ? self::$payStatus[$value1['pay_status']] : "未知状态"; + $value1['sdk_version'] = getSDKTypeName($value1['sdk_version']); switch ($value1['level']) { case 3: $value1['p_p_pro_account'] = $promoteData[$value1['parent_id']]['account']; @@ -3212,7 +3227,9 @@ class DownloadController extends BaseController { $csvData["pay_order_number"] = $value1["pay_order_number"]; $csvData["pay_amount"] = $value1["pay_amount"]; $csvData["pay_way"] = $value1["pay_way"]; + $csvData['pay_status'] = $value1['pay_status']; $csvData["game_name"] = $value1["game_name"]; + $csvData["sdk_version"] = $value1['sdk_version']; $csvData["server_name"] = $value1["server_name"]; $csvData["game_player_name"] = $value1["game_player_name"]; $csvData["p_p_proinfo"] = $value1["p_p_proinfo"]; @@ -3239,7 +3256,9 @@ class DownloadController extends BaseController { $csvData1["pay_order_number"] = "--"; $csvData1["pay_amount"] = $income; $csvData1["pay_way"] = "--"; + $csvData1['pay_status'] = "--"; $csvData1["game_name"] = "--"; + $csvData1["sdk_version"] = "--"; $csvData1["server_name"] = "--"; $csvData1["game_player_name"] = "--"; $csvData1["p_p_proinfo"] = "--"; From 1409846ac3782ed4421630dafaae935e60f40809 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Mon, 9 Dec 2019 20:00:45 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=88=87=E6=8D=A2IOS=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From a2de4bed7bce60fc31bd057ee1e55537eb303226 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 11:27:20 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=88=87=E6=8D=A2IOS=E6=96=B0=E6=97=A7?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..dcfe7edf7 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() From 92accdc727c98560164264648463befd92b0c2ab Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 14:06:24 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Base/Service/GameSourceService.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index dcfe7edf7..4b29cf111 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = false; + const IS_FIXED_IOS13 = true; const DEBUG = true; public function __construct() From 40472088719c8297d7e2458bf9c893454e2ef6d0 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 10 Dec 2019 14:18:19 +0800 Subject: [PATCH 12/20] =?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>=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2--=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/recharge.html | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index c3a078c79..a7f02d908 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -227,6 +227,7 @@ 合计 -- -- + -- {$income} -- -- From f392ad4de081028d7b538fb41529229210001066 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Tue, 10 Dec 2019 16:19:44 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BehaviorLogController.class.php | 70 +++ Application/Admin/View/BehaviorLog/index.html | 464 ++++++++++++++++++ 2 files changed, 534 insertions(+) create mode 100644 Application/Admin/Controller/BehaviorLogController.class.php create mode 100644 Application/Admin/View/BehaviorLog/index.html diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php new file mode 100644 index 000000000..1ceafba57 --- /dev/null +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -0,0 +1,70 @@ + $v) { + if (!in_array($k, $ignoreData)) { + $map[$k] = $v; + } + } + + $p = $params['p'] ? $params['p'] : 1; + $row = $params['row'] ? $params['row'] : 10; + + $startDate = empty($params['timestart']) ? date('Y-m-d', strtotime('-6 day', time())) : $params['timestart']; + $endDate = empty($params['timeend']) ? date('Y-m-d') : $params['timeend']; + $startTime = strtotime($startDate); + $endTime = strtotime($endDate) + 86399; + $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); + if (I('promote_id')) { + if ($promoteId == 0) { + $map['promote_id'] = 0; + } else { + $promoteMap['chain'] = ['like', "%/$promoteId/%"]; + $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true); + $map['promote_id'] = ['in', $promoteIds]; + } + } + $data = M('pay_info', 'tab_')->where($map)->order('id DESC')->page($p, $row)->select(); + $count = M('pay_info', 'tab_')->where($map)->count(); + $page = set_pagination($count, $row); + if ($page) { + $this->assign('_page', $page); + } + $this->assign('startDate', $startDate); + $this->assign('endDate', $endDate); + $this->assign('data', $data); + $this->display('index'); + } + +} diff --git a/Application/Admin/View/BehaviorLog/index.html b/Application/Admin/View/BehaviorLog/index.html new file mode 100644 index 000000000..0ee33fb7f --- /dev/null +++ b/Application/Admin/View/BehaviorLog/index.html @@ -0,0 +1,464 @@ + + + + + + + + + +
+

行为日志

+

说明：玩家在游戏里的行为日志

+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + - +
+ + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ + - +
+
+ +
+ + +
+ 搜索 +
+
+ + +
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
CP订单号充值时间玩家账号游戏名称游戏区服所属推广员角色ID角色名称订单金额
aOh! 暂时还没有内容!
{$vo.extend}{:set_show_time($vo['create_time'])}{$vo.user_account}{$vo.game_name}{$vo.server_name}{$vo.promote_account}{$vo.game_player_id}{$vo.game_player_name}{$vo.price}
+
+
+
+ + {$_page|default=''} +
+ +
+ +
+ + +
+ 已添加添加至常用设置 +
+ + + + + + if(C('COLOR_STYLE')=='blue_color') echo ' + + '; + + + + + + + + From f8498638ad8992228620659d9bbc87ff0a5919bb Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Tue, 10 Dec 2019 16:40:56 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/BehaviorLogController.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/BehaviorLogController.class.php b/Application/Admin/Controller/BehaviorLogController.class.php index 1ceafba57..ec5612d45 100644 --- a/Application/Admin/Controller/BehaviorLogController.class.php +++ b/Application/Admin/Controller/BehaviorLogController.class.php @@ -46,12 +46,15 @@ class BehaviorLogController extends ThinkController $startTime = strtotime($startDate); $endTime = strtotime($endDate) + 86399; $map['create_time'] = array('BETWEEN', [$startTime, $endTime]); - if (I('promote_id')) { + if ($promoteId = I('promote_id')) { if ($promoteId == 0) { $map['promote_id'] = 0; } else { $promoteMap['chain'] = ['like', "%/$promoteId/%"]; $promoteIds = M('Promote', 'tab_')->where($promoteMap)->getField('id', true); + if(empty($promoteIds)) { + $promoteIds[] = $promoteIds; + } $map['promote_id'] = ['in', $promoteIds]; } } From 14644b44a246a0d80a3453fb9b4990268215ab2b Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 16:46:45 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=94=B9=E4=B8=BA=E4=BD=BF=E7=94=A8=E6=B8=B8=E6=88=8F?= =?UTF-8?q?=E6=88=AA=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 12 +++++++++++- Application/Home/Controller/HomeController.class.php | 7 +++++++ Application/Home/View/default/Home/landingPage.html | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index a49fa8538..49f205480 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -333,7 +333,7 @@ - 横版游戏建议尺寸：16：9，1280*720px及以上；竖版游戏建议尺寸：9：16，720*1280px及以上，用于游戏详情页内展示 + 建议尺寸：750*1334，图片大小不超过3M @@ -1562,6 +1562,7 @@ id:'#screenshot', multiple:true }, + fileSingleSizeLimit:3*1024*1024, //设定单个文件大小 // dnd: false, paste: document.body, accept: { @@ -1655,6 +1656,15 @@ $percent.text( (percentage * 100).toFixed(0) + '%' ); }); + /** + * 验证文件格式以及文件大小 + */ + uploaderVideo.on("error",function (type){ + if(type=="F_EXCEED_SIZE"){ + layer.msg("视频大小不能超过3M"); + } + }); + uploaderImgScreen.on( 'uploadSuccess', function( file , response) { imgListScreenData.push(Number(response.id)); console.log(imgListScreenData) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index ff6301680..aab22d5cf 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -209,6 +209,13 @@ class HomeController extends Controller } $game['flooring_page_imgs'] = $imageUrls; + $screenshotIds = explode(',', $game['screenshot']) ?? []; + $screenshotUrls = []; + foreach ($screenshotIds as $screenshotId) { + $screenshotUrls[] = get_cover($screenshotId, 'path'); + } + $game['screenshot'] = $screenshotUrls; + $isNewIos = false; if ($gameSource['is_new_sdk'] == 1) { $isNewIos = true; diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index bdca5ba6e..fab68793e 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -113,7 +113,7 @@
    - +
    • From c451921b92725e3256049984133414bffadfaca7 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 17:07:38 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=B7=BB=E5=8A=A0IOS?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=B9=E5=BC=8F=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/AutoPackController.class.php | 2 +- Application/Admin/Event/SourceEvent.class.php | 1 - Application/Admin/View/GameSource/add.html | 10 ++++++++++ Application/Admin/View/GameSource/edit.html | 11 ++++++++++- Application/Base/Service/GameSourceService.class.php | 5 +++-- Application/Home/Controller/HomeController.class.php | 6 +++--- 6 files changed, 27 insertions(+), 8 deletions(-) diff --git a/Application/Admin/Controller/AutoPackController.class.php b/Application/Admin/Controller/AutoPackController.class.php index 622619e61..e7da748cd 100644 --- a/Application/Admin/Controller/AutoPackController.class.php +++ b/Application/Admin/Controller/AutoPackController.class.php @@ -319,7 +319,7 @@ class AutoPackController extends Think $launchCountList = M('apply_launch', 'tab_')->field(['apply_id', 'count(*) count'])->where(['apply_id' => ['in', $applyIds]])->group('apply_id')->select(); $launchCountList = index_by_column('apply_id', $launchCountList); - $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id'])->where(['game_id' => ['in', $gameIds]])->select(); + $gameSources = M('game_source', 'tab_')->field(['id', 'file_name', 'source_version', 'file_type', 'bao_name', 'game_id', 'is_new_sdk'])->where(['game_id' => ['in', $gameIds]])->select(); $gameSources = index_by_column('game_id', $gameSources); $gameSourceService = new GameSourceService(); diff --git a/Application/Admin/Event/SourceEvent.class.php b/Application/Admin/Event/SourceEvent.class.php index 8627141d9..64c9862bb 100644 --- a/Application/Admin/Event/SourceEvent.class.php +++ b/Application/Admin/Event/SourceEvent.class.php @@ -96,7 +96,6 @@ class SourceEvent extends Controller } } $data['source_version'] = $game_source['source_version'] + 1; - $version = ''; $packageName = ''; if ($data['file_type'] == 1) { diff --git a/Application/Admin/View/GameSource/add.html b/Application/Admin/View/GameSource/add.html index aeabae76f..1c9c6d83f 100644 --- a/Application/Admin/View/GameSource/add.html +++ b/Application/Admin/View/GameSource/add.html @@ -91,6 +91,14 @@ + + 是否新包 + + + + + + *上传原包 @@ -420,8 +428,10 @@ $("#game_id").change(function(){ $("#game_name").val($("#game_id option:selected").text()); $("#file_type").val(type); if (type == 2){ + $('#is-new-sdk').show(); $('#apply_bz').show(); }else{ + $('#is-new-sdk').hide(); $('#apply_bz').hide(); } //if(type == 1){$('.pack_name_class').show();}else{$('.pack_name_class').hide();} diff --git a/Application/Admin/View/GameSource/edit.html b/Application/Admin/View/GameSource/edit.html index 251a72ceb..9f4d450a8 100644 --- a/Application/Admin/View/GameSource/edit.html +++ b/Application/Admin/View/GameSource/edit.html @@ -78,7 +78,16 @@     - + + + 是否新包 + + + + + + + 上传原包 diff --git a/Application/Base/Service/GameSourceService.class.php b/Application/Base/Service/GameSourceService.class.php index 4b29cf111..595b13c3b 100644 --- a/Application/Base/Service/GameSourceService.class.php +++ b/Application/Base/Service/GameSourceService.class.php @@ -9,7 +9,7 @@ use GuzzleHttp\Client; class GameSourceService { - const IS_FIXED_IOS13 = true; + const IS_FIXED_IOS13 = false; const DEBUG = true; public function __construct() @@ -92,7 +92,8 @@ class GameSourceService { return false; } - if (self::IS_FIXED_IOS13 && $game['sdk_version'] == 2) { + $isNewSdk = (isset($gameSource['is_new_sdk']) && $gameSource['is_new_sdk'] == 1); + if ($isNewSdk && $game['sdk_version'] == 2) { $channelFolder = $this->getChannelConfigFolder($zip, $packData); return $this->packChannelFolder($zip, $channelFolder); } else { diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index 5a0a198ad..d10d69ff0 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -198,7 +198,7 @@ class HomeController extends Controller ->find(); $game['icon'] = get_cover($game['icon'], 'path'); - $gameSource = M('GameSource', 'tab_')->field(['create_time', 'org_plist_url'])->where(array('game_id' => $game['id']))->find(); + $gameSource = M('GameSource', 'tab_')->field(['create_time', 'org_plist_url', 'is_new_sdk'])->where(array('game_id' => $game['id']))->find(); $imageIds = explode(',', $game['flooring_page_imgs']) ?? []; $imageUrls = []; @@ -208,9 +208,9 @@ class HomeController extends Controller $game['flooring_page_imgs'] = $imageUrls; $isNewIos = false; - /* if ($gameSource['create_time'] > strtotime(date('2019-11-27 00:00:00'))) { + if ($gameSource['is_new_sdk'] == 1) { $isNewIos = true; - } */ + } $downloadUrl = ''; if (!$isNewIos && $isIOS13) { From 6f7a930c255fb14297a4863e6de7ed51719b3e5c Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Tue, 10 Dec 2019 17:09:14 +0800 Subject: [PATCH 17/20] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 1490c7dbf..476391786 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -613,3 +613,6 @@ order_time:切分时间' WHERE `id` = 29; --新增风控类型 ALTER TABLE `tab_device_bans` MODIFY COLUMN `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '类型 0未知 1设备号 2IP 3落地页链接 4下载链接' AFTER `tag`; + +-- 新旧IOS打包标识 +ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; From 188abdcbdd7cf6799fd47933600127ebf81b51c5 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 18:26:21 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E8=90=BD=E5=9C=B0=E9=A1=B5=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E7=BD=AE=E9=A1=B6=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Game/edit.html | 25 ++++++++ .../Home/Controller/HomeController.class.php | 3 +- .../Home/View/default/Home/landingPage.html | 60 ++++++++++++++----- Data/update.sql | 1 + Public/Home/css/index2.css | 4 +- 5 files changed, 74 insertions(+), 19 deletions(-) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index 49f205480..9bfe4fbee 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -384,6 +384,31 @@ + + ios视频是否置顶： + + + + + + + + + + + + + + + diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index aab22d5cf..c709b6208 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -179,7 +179,8 @@ class HomeController extends Controller 'game_size', 'introduction', 'flooring_page_video', - 'supersign_status' + 'supersign_status', + 'ios_video_top' ]; $map = ['id' => intval($gameId)]; $game = M('game', 'tab_')->field($columns)->where($map)->find(); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index fab68793e..0dce88c12 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -45,6 +45,8 @@
    + +
    style="height: 0" >
    @@ -57,17 +59,29 @@
    + + +
    +
    + +
    + +
    + +
    @@ -335,17 +349,30 @@ @@ -355,6 +382,7 @@ var video = document.getElementById("shakeVideo"); + console.log(video) video.play(); document.addEventListener('WeixinJSBridgeReady',function(){ video.play(); diff --git a/Data/update.sql b/Data/update.sql index 21e61074f..c4b7e0a93 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -656,3 +656,4 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2 --游戏表新增字段-落地页视频 liuweiwen 2019-12-09 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频'; ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭'; +ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶'; diff --git a/Public/Home/css/index2.css b/Public/Home/css/index2.css index 9cef35936..3a43af57a 100644 --- a/Public/Home/css/index2.css +++ b/Public/Home/css/index2.css @@ -40,6 +40,7 @@ font-size: 0.32rem; color: #007AFF; line-height: 1.2rem; + height: 100%; } .fiexd-heardBox>img{ width: 0.6rem; @@ -55,7 +56,7 @@ font-size: 0.2rem; margin-right: 0.14rem; } -.fiexd-pay>div{ +.download{ width: 1.5rem; height: 0.6rem; background-color: #007AFF; @@ -65,7 +66,6 @@ line-height: 0.6rem; color: #fff; font-weight: 500; - margin-top: 0.3rem; } .heard{ width: 100%; From 48ae252b4e072452d85dd72722fc225df0b79d21 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 10 Dec 2019 18:27:45 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=E8=A7=86=E9=A2=91=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=BD=AE=E9=A1=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/Data/update.sql b/Data/update.sql index c365cc758..93eda7d90 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -653,6 +653,7 @@ VALUES ('ServerNotice', '游戏区服预告', '0', '', '1', '{\"1\":[\"289\",\"2 --游戏表新增字段-落地页视频 liuweiwen 2019-12-09 ALTER TABLE tab_game ADD `flooring_page_video` varchar(150) NOT NULL DEFAULT '' COMMENT '落地页视频'; ALTER TABLE tab_game ADD `supersign_status` tinyint(1) DEFAULT '1' COMMENT '超级签开关：1-开启；0-关闭'; +ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落地页视频是否置顶：1-置顶；0-不置顶'; -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; From 46dda0848f4b364a8ba34b4aef4cacc4ede15a29 Mon Sep 17 00:00:00 2001 From: tpingzhang <635929049@qq.com> Date: Wed, 11 Dec 2019 09:24:26 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E5=90=88=E6=9C=8D=20=20=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Data/update.sql | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/Data/update.sql b/Data/update.sql index 93eda7d90..68d6fd901 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -657,3 +657,41 @@ ALTER TABLE tab_game ADD `ios_video_top` tinyint(1) DEFAULT '1' COMMENT 'ios落 -- 新旧IOS打包标识 ALTER TABLE `tab_game_source` add COLUMN `is_new_sdk` tinyint(2) DEFAULT '0' COMMENT '是否新SDK(IOS)'; + +-- 合服游戏区服表 tping +CREATE TABLE `tab_server_union` ( + `id` int(11) NOT NULL AUTO_INCREMENT COMMENT '主键自增', + `game_id` int(11) NOT NULL COMMENT '游戏id', + `game_name` varchar(30) NOT NULL COMMENT '游戏名称', + `server_name` varchar(30) NOT NULL COMMENT '区服名称', + `server_num` int(11) DEFAULT NULL COMMENT '对接区服id', + `recommend_status` tinyint(2) DEFAULT '1' COMMENT '推荐状态(0:否,1:是)', + `show_status` tinyint(2) DEFAULT '1' COMMENT '显示状态(0:否,1:是)', + `stop_status` tinyint(2) DEFAULT '0' COMMENT '是否停服(0:否,1:是)', + `server_status` tinyint(2) DEFAULT '0' COMMENT '区服状态(0:正常,1拥挤,2爆满)', + `icon` int(11) DEFAULT NULL COMMENT '区服图标', + `start_time` int(11) DEFAULT NULL COMMENT '开始时间', + `desride` varchar(300) DEFAULT NULL COMMENT '描述', + `prompt` varchar(300) DEFAULT NULL COMMENT '停服提示', + `parent_id` int(11) DEFAULT NULL COMMENT '父类id', + `create_time` int(11) DEFAULT NULL COMMENT '创建时间', + `server_version` tinyint(2) DEFAULT NULL COMMENT '运营平台 1and 2ios 0双平台', + `developers` int(11) DEFAULT '0' COMMENT '开发商', + `server_id` varchar(50) NOT NULL DEFAULT '' COMMENT '对接区服id', + PRIMARY KEY (`id`), + KEY `game_id` (`game_id`), + KEY `show_status` (`show_status`), + KEY `start_time` (`start_time`), + KEY `create_time` (`create_time`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='合服游戏区服表'; + +-- 用户行为 +ALTER TABLE `tab_pay_info` ADD COLUMN `user_account` varchar(30) DEFAULT NULL COMMENT '用户账号'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_name` varchar(30) DEFAULT '' COMMENT '游戏玩家昵称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_name` varchar(30) DEFAULT '' COMMENT '游戏名称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `server_id` int(11) DEFAULT '0' COMMENT '区服id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `server_name` varchar(30) DEFAULT '' COMMENT '区服名称'; +ALTER TABLE `tab_pay_info` ADD COLUMN `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `game_player_id` int(11) DEFAULT '0' COMMENT '玩家游戏内id'; +ALTER TABLE `tab_pay_info` ADD COLUMN `sdk_version` tinyint(2) DEFAULT '1' COMMENT '区别sdk版本1安卓 2苹果 '; +ALTER TABLE `tab_pay_info` ADD COLUMN `promote_account` varchar(30) DEFAULT '' COMMENT '推广员账号'; \ No newline at end of file