From 04dd31e945c2bebe9c0a805f2f65abc9639059e4 Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Mon, 16 Dec 2019 21:17:46 +0800 Subject: [PATCH 01/23] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 9af3fa9a9..9d3ed0b22 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1958,7 +1958,7 @@ class QueryController extends BaseController public function getSubPromotes() { - $promoteId = I('promote_id', 0); + $promoteId = I('promote_id', 0) ?: -1; $promotes = M('promote', 'tab_')->field(['id', 'account', 'real_name'])->where(['parent_id' => $promoteId])->select(); $this->ajaxReturn([ 'status' => 1, From 8fa2a6cef37775034af3444163fa6c6c248b4f22 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 10:24:21 +0800 Subject: [PATCH 02/23] =?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/Controller/QueryController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index a5aaf12bb..63e44c57b 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1859,7 +1859,7 @@ class QueryController extends BaseController ->field($field) ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') ->where($map) - ->group('uc.role_id,uc.game_id,uc.user_id,uc.id') + ->group('uc.role_id,uc.game_id,uc.user_id') ->buildSql(); $query = M()->alias('record') ->table($subQuery) @@ -1870,7 +1870,7 @@ class QueryController extends BaseController $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') - ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id,uc.id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') ->where($map) ->buildSql(); $total = M()->alias('totals') From f854ca6bbb1d7bb861c6d0613f65b593ca38a431 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 11:33:02 +0800 Subject: [PATCH 03/23] =?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/Common/function.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Common/function.php b/Application/Home/Common/function.php index 2827ba43b..d473d7d5c 100644 --- a/Application/Home/Common/function.php +++ b/Application/Home/Common/function.php @@ -1201,7 +1201,7 @@ function getChildGameAddPermission($promoteId) function gameSearch($relationGameId, $sdkVersion) { - $map = '1 = 1'; + $map['_string'] = '1 = 1'; if ($relationGameId != 0) { $map['relation_game_id'] = $relationGameId; } From 9b64a3a4f10edf12d01850eafefd529ba12d0d0a Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 17 Dec 2019 11:44:56 +0800 Subject: [PATCH 04/23] =?UTF-8?q?=E8=A7=A6=E5=B1=8F=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- policy.html | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) create mode 100644 policy.html diff --git a/policy.html b/policy.html new file mode 100644 index 000000000..134a7676c --- /dev/null +++ b/policy.html @@ -0,0 +1,125 @@ + + + + + 隐私政策 + + +

+ 隐私政策 +

+

+ 本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。 +

+
    +
  1. + 适用范围 +
      +
    1. + 在您注册本应用帐号时，您根据本应用要求提供的个人注册信息； +
      2. +
    2. + 在您使用本应用网络服务，或访问本应用平台网页时，本应用自动接收并记录的您的浏览器和计算机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据； +
      3. +
    3. + 本应用通过合法途径从商业伙伴处取得的用户个人数据。 +
      4. +
    + 您了解并同意，以下信息不适用本隐私权政策： +
      +
    1. + 您在使用本应用平台提供的搜索服务时输入的关键字信息； +
      2. +
    2. + 本应用收集到的您在本应用发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情； +
      3. +
    3. + 违反法律规定或违反本应用规则行为及本应用已对您采取的措施。 +
      4. + +
    +
    2. +
  2. + 信息使用 +
      +
    1. + 本应用不会向任何无关第三方提供、出售、出租、分享或交易您的个人信息，除非事先得到您的许可，或该第三方和本应用（含本应用关联公司）单独或共同为您提供服务，且在该服务结束后，其将被禁止访问包括其以前能够访问的所有这些资料。 +
      2. +
    2. + 本应用亦不允许任何第三方以任何手段收集、编辑、出售或者无偿传播您的个人信息。任何本应用平台用户如从事上述活动，一经发现，本应用有权立即终止与该用户的服务协议。 +
      3. +
    3. + 为服务用户的目的，本应用可能通过使用您的个人信息，向您提供您感兴趣的信息，包括但不限于向您发出产品和服务信息，或者与本应用合作伙伴共享信息以便他们向您发送有关其产品和服务的信息（后者需要您的事先同意）。 +
      4. +
    +
    3. +
  3. + 信息披露
    + 在如下情况下，本应用将依据您的个人意愿或法律的规定全部或部分的披露您的个人信息： +
      +
    1. + 经您事先同意，向第三方披露； +
      2. +
    2. + 为提供您所要求的产品和服务，而必须和第三方分享您的个人信息； +
      3. +
    3. + 根据法律的有关规定，或者行政或司法机构的要求，向第三方或者行政、司法机构披露； +
      4. +
    4. + 如您出现违反中国有关法律、法规或者本应用服务协议或相关规则的情况，需要向第三方披露； +
      5. +
    5. + 如您是适格的知识产权投诉人并已提起投诉，应被投诉人要求，向被投诉人披露，以便双方处理可能的权利纠纷； +
      6. +
    6. + 在本应用平台上创建的某一交易中，如交易任何一方履行或部分履行了交易义务并提出信息披露请求的，本应用有权决定向该用户提供其交易对方的联络方式等必要信息，以促成交易的完成或纠纷的解决。 +
      7. +
    7. + 其它本应用根据法律、法规或者网站政策认为合适的披露。 +
      8. +
    +
    4. +
  4. + 信息存储和交换
    + 本应用收集的有关您的信息和资料将保存在本应用及（或）其关联公司的服务器上，这些信息和资料可能传送至您所在国家、地区或本应用收集信息和资料所在地的境外并在境外被访问、存储和展示。 +
    5. +
  5. + Cookie的使用 +
      +
    1. + 在您未拒绝接受cookies的情况下，本应用会在您的计算机上设定或取用cookies ，以便您能登录或使用依赖于cookies的本应用平台服务或功能。本应用使用cookies可为您提供更加周到的个性化服务，包括推广服务。 +
      2. +
    2. + 您有权选择接受或拒绝接受cookies。您可以通过修改浏览器设置的方式拒绝接受cookies。但如果您选择拒绝接受cookies，则您可能无法登录或使用依赖于cookies的本应用网络服务或功能。 +
      3. +
    3. + 通过本应用所设cookies所取得的有关信息，将适用本政策。 +
      4. +
    +
    6. +
  6. + 信息安全 +
      +
    1. + 本应用帐号均有安全保护功能，请妥善保管您的用户名及密码信息。本应用将通过对用户密码进行加密等安全措施确保您的信息不丢失，不被滥用和变造。尽管有前述安全措施，但同时也请您注意在信息网络上不存在“完善的安全措施”。 +
      2. +
    2. + 在使用本应用网络服务进行网上交易时，您不可避免的要向交易对方或潜在的交易对 +
      3. +
    +
    7. +
  7. + 本隐私政策的更改 +
      +
    1. + 如果决定更改隐私政策，我们会在本政策中、本公司网站中以及我们认为适当的位置发布这些更改，以便您了解我们如何收集、使用您的个人信息，哪些人可以访问这些信息，以及在什么情况下我们会透露这些信息。 +
      2. +
    2. + 本公司保留随时修改本政策的权利，因此请经常查看。如对本政策作出重大更改，本公司会通过网站通知的形式告知。 +
      3. +
    +
    8. +
+ + \ No newline at end of file From 62412fcf2b871cbc77555f188729600107aec061 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 17 Dec 2019 11:49:38 +0800 Subject: [PATCH 05/23] =?UTF-8?q?=E8=A7=A6=E5=B1=8F=E5=AE=98=E7=BD=91?= =?UTF-8?q?=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- policy.html | 1 - 1 file changed, 1 deletion(-) diff --git a/policy.html b/policy.html index 134a7676c..38831ca2e 100644 --- a/policy.html +++ b/policy.html @@ -1,5 +1,4 @@ - 隐私政策 From 4d070462ac2a8b97bd18abcf23edf13f9e12adba Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 12:33:09 +0800 Subject: [PATCH 06/23] =?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 --- .../Home/Controller/QueryController.class.php | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 63e44c57b..6f07d8ae2 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1782,16 +1782,13 @@ class QueryController extends BaseController $ids[] = $queryPromote['id']; $map = ['uc.promote_id' => ['in', $ids]]; - $subMap = ['promote_id' => ['in', $ids]]; if ($relationGameId != 0 || $sdkVersion != 0) { $gameIds = gameSearch($relationGameId, $sdkVersion); $map['uc.game_id'] = ['in', $gameIds]; - $subMap['game_id'] = ['in', $gameIds]; } if ($serverId != 0) { $map['uc.server_id'] = $serverId; - $subMap['server_id'] = $serverId; } if ($roleName != '') { $map['ui.role_name'] = ['like', $roleName . '%']; @@ -1857,9 +1854,9 @@ class QueryController extends BaseController $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; $subQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($field) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->where($map) - ->group('uc.role_id,uc.game_id,uc.user_id') + ->group('uc.role_id,uc.server_id,uc.game_id') ->buildSql(); $query = M()->alias('record') ->table($subQuery) @@ -1867,15 +1864,10 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') + $total = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') - ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') + ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') ->where($map) - ->buildSql(); - $total = M()->alias('totals') - ->table($totalQuery) - ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); foreach ($records as &$list) { From fc2596a7cc47819b0b23d773993047fef277ab3c Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Dec 2019 14:58:04 +0800 Subject: [PATCH 07/23] =?UTF-8?q?=E5=85=85=E5=80=BC=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=BD=93=E5=A4=A9=E6=97=B6=E9=97=B4=E5=8C=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/DownloadController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 012598ebe..0a524b649 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3178,7 +3178,7 @@ class DownloadController extends BaseController { unset($map['costbegin']); unset($map['costend']); $nowTime = strtotime(date('Y-m-d 00:00:00', time())); - $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]]; + $subMap['create_time'] = ['between', [$map['begintime'], $map['endtime']-1]]; if ($costBegin != '' || $costEnd != '') { $having = ''; if ($costBegin != '' && $costEnd != '') { @@ -3196,7 +3196,7 @@ class DownloadController extends BaseController { $map['_string'] = 'ui.role_id in (' . $subQuery . ')'; } $secondDay = 24*3600 + 1; - $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]]; + $map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime']-1]]; unset($map['begintime']); unset($map['endtime']); //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id'; From a19a7b530eadbb7bc033d1da0e1bb6d537300aaa Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 16:20:17 +0800 Subject: [PATCH 08/23] =?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>=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E6=A6=82=E5=86=B5--=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Home/Controller/QueryController.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 6f07d8ae2..66b79687d 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1114,6 +1114,7 @@ class QueryController extends BaseController $summaryData = []; $dayList = $this->getDayList($begTime, $endTime); + $dayList = array_reverse($dayList); $params['dayList'] = $dayList; $records = []; From 60fff33fca2130261b72868238ab33268c13de66 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 17:22:45 +0800 Subject: [PATCH 09/23] =?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 --- .../Home/Controller/QueryController.class.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index 66b79687d..7b1c4b9ba 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1114,6 +1114,7 @@ class QueryController extends BaseController $summaryData = []; $dayList = $this->getDayList($begTime, $endTime); + $dayListReverse = $dayList; $dayList = array_reverse($dayList); $params['dayList'] = $dayList; @@ -1185,7 +1186,9 @@ class QueryController extends BaseController $allData['spend_binding'] = bcadd($allData['spend_binding'], $spendBindingList[$day], 2); $allData['spend_discount'] = bcadd($allData['spend_discount'], 0, 2); $allData['spend_voucher'] = bcadd($allData['spend_voucher'], 0, 2); - + } + foreach ($dayListReverse as $day) { + $date = date('Ymd', strtotime($day)); $summaryData['date'][] = $date; $summaryData['role_num'][] = $roleNumList[$day]; $summaryData['user_num'][] = $userNumList[$day]; @@ -1865,10 +1868,15 @@ class QueryController extends BaseController list($records, $pagination, $count) = $this->paginate($query); - $total = M('user_play_data_count', 'tab_')->alias('uc') + $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') ->where($map) + ->buildSql(); + $total = M()->alias('totals') + ->table($totalQuery) + ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); foreach ($records as &$list) { From 2cb7d9bdfdb06e67752bf4a2841513d7745e262b Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 17 Dec 2019 17:33:02 +0800 Subject: [PATCH 10/23] =?UTF-8?q?=E6=89=B6=E6=8C=81=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=94=B9=E6=88=90=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Support/lists.html | 12 ++++++------ .../Admin/View/TestResource/supportNumberList.html | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index 8c82c84d7..f5619647f 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -32,7 +32,7 @@
-

扶持发放

+

资源发放

说明：记录所有扶持发放的数据

@@ -77,8 +77,8 @@
@@ -111,7 +111,7 @@ 区服 角色名 申请额度 - 扶持类型 + 资源类型 备注 申请时间 可用额度 @@ -134,7 +134,7 @@ {$data['server_name']} {$data['role_name']} {$data['apply_resource']} - 新增扶持后续扶持 + 新增资源后续资源 {$data['apply_remark']} {:date('Y-m-d H:i:s',$data['create_time'])} @@ -170,7 +170,7 @@
- 导出 + 导出 {$_page|default=''}
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html index f996a2501..c95054689 100644 --- a/Application/Admin/View/TestResource/supportNumberList.html +++ b/Application/Admin/View/TestResource/supportNumberList.html @@ -33,11 +33,11 @@
- class="tabchose" href="{:U('supportNumberList',array('type'=>1))}">扶持号管理 + class="tabchose" href="{:U('supportNumberList',array('type'=>1))}">资源管理
-

扶持号管理

+

资源管理

-

说明：此功能是扶持号管理<的功能

+

说明：此功能是资源管理的功能

说明：此功是查看并管理混服申请的功能

 @@ -101,7 +101,7 @@ 角色名称 设备信息 状态 - 创建时间 + 创建时间 操作 From 62c54cda7fb191a94a52612fc1cf4f0acfa7a2f1 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 17:45:10 +0800 Subject: [PATCH 11/23] =?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 --- .../Controller/DownloadController.class.php | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 0a524b649..695c1c244 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3200,31 +3200,39 @@ class DownloadController extends BaseController { unset($map['begintime']); unset($map['endtime']); //$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id'; - - $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today"; - $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; - $loginRecordMap['lr.create_time'] = $map['uc.create_time']; - $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id'; - $fieldLR = M('login_daily_record', 'tab_')->alias('lr') - ->field("count(*) as count") - ->where($loginRecordMap) - ->buildSql(); - $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; - $subQuery = M('user_play_data_count', 'tab_')->alias('uc') - ->field($field) - ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') - ->where($map) - ->group('uc.role_id,uc.server_id,uc.game_id') - ->buildSql(); + + $fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id"; + $fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time"; + + $loginRecordMap['lr.create_time'] = $map['uc.create_time']; + $loginRecordMap['_string'] = 'lr.user_id = uc.user_id and lr.game_id = uc.game_id'; + $fieldLR = M('login_daily_record', 'tab_')->alias('lr') + ->field("count(*) as count") + ->where($loginRecordMap) + ->buildSql(); + $field = $fieldUC . ',' . $fieldUI . ',' . $fieldLR . ' as user_game_login_count'; + $subQuery = M('user_play_data_count', 'tab_')->alias('uc') + ->field($field) + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') + ->where($map) + ->group('uc.role_id,uc.server_id,uc.game_id') + ->buildSql(); $roles = M()->alias('record') ->table($subQuery) ->select(); - $total = []; - $total = M('user_play_data_count', 'tab_')->alias('uc') - ->field($fieldUC) - ->join('left join tab_user_play_info as ui on ui.game_id = uc.game_id and ui.server_id = uc.server_id and ui.role_id = uc.role_id') - ->where($map) - ->find(); + $totalQuery = M('user_play_data_count', 'tab_')->alias('uc') + ->field($fieldUC) + ->join('left join tab_user_play_info as ui on ui.user_id = uc.user_id and ui.game_id = uc.game_id and uc.server_id = ui.server_id and ui.role_id = uc.role_id') + ->group('uc.role_id,uc.game_id,uc.server_id,uc.user_id') + ->where($map) + ->buildSql(); + $total = M()->alias('totals') + ->table($totalQuery) + ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') + ->find(); + $userIds = array_column($roles, 'user_id'); + $userIds = $userIds ?? [-1]; + $users = M('user', 'tab_')->where(array('id' => ['in', $userIds]))->getField('id, account', true); $csvFileName = $xlsName.'.csv'; //设置好告诉浏览器要下载excel文件的headers header('Content-Description: File Transfer'); @@ -3247,6 +3255,9 @@ class DownloadController extends BaseController { ->limit(($i-1)*$perSize ,$perSize) ->select(); foreach($data as $key => $value) { + if (empty($value['user_account']) ) { + $value['user_account'] = $users[$value['user_id']] ?? ''; + } $csvData['user_account'] = empty($value['user_account']) ? '--' : encryption($value['user_account']); $csvData['game_name'] = empty($value['game_name']) ? '--' :$value['game_name']; $csvData['server_name'] = empty($value['server_name']) ? '--' :$value['server_name']; From 25a4138842e86eafc28c4485dac1cb8fc2ed8405 Mon Sep 17 00:00:00 2001 From: zhengchanglong Date: Tue, 17 Dec 2019 17:52:50 +0800 Subject: [PATCH 12/23] =?UTF-8?q?=E6=89=B6=E6=8C=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AD=97=E7=9C=BC=E6=94=B9=E6=88=90=E8=B5=84=E6=BA=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Support/lists.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Support/lists.html b/Application/Admin/View/Support/lists.html index f5619647f..296f0c202 100644 --- a/Application/Admin/View/Support/lists.html +++ b/Application/Admin/View/Support/lists.html @@ -74,7 +74,7 @@
- + From ad0b88553ba7ca6d0752a66257fa903315ca2d97 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 19:21:13 +0800 Subject: [PATCH 15/23] =?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/Controller/QueryController.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php index d20e9e931..76728d4cf 100644 --- a/Application/Home/Controller/QueryController.class.php +++ b/Application/Home/Controller/QueryController.class.php @@ -1798,7 +1798,9 @@ class QueryController extends BaseController $map['ui.role_name'] = ['like', $roleName . '%']; } if ($userAccount != '') { - $map['ui.user_account'] = ['like', $userAccount . '%']; + $userId = M('user', 'tab_')->where(array('account' => ['like', $userAccount . '%']))->getField('id'); + $userId = $userId ?? 0; + $map['uc.user_id'] = $userId; } if ($isSelf) { $map['uc.promote_id'] = $queryPromote['id']; From bb17441528615abcc3cf63b5420642eb45680fc9 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 19:24:32 +0800 Subject: [PATCH 16/23] =?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/Controller/DownloadController.class.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 695c1c244..c5b4f1c00 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3166,8 +3166,10 @@ class DownloadController extends BaseController { } if(!empty($map['user_account'])) { - $map['ui.user_account'] = $map['user_account']; - unset($map['user_account']); + $userId = M('user', 'tab_')->where(array('account' => ['like', $map['user_account'] . '%']))->getField('id'); + $userId = $userId ?? 0; + $map['uc.user_id'] = $userId; + unset($map['user_account']); } if(!empty($map['promote_id'])) { $map['uc.promote_id'] = $map['promote_id']; From 19899157671014c569a00bfb62f962b3a11f84d4 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 19:30:47 +0800 Subject: [PATCH 17/23] =?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/Controller/DownloadController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index c5b4f1c00..50395dd30 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3166,7 +3166,7 @@ class DownloadController extends BaseController { } if(!empty($map['user_account'])) { - $userId = M('user', 'tab_')->where(array('account' => ['like', $map['user_account'] . '%']))->getField('id'); + $userId = M('user', 'tab_')->where(array('account' => $map['user_account']))->getField('id'); $userId = $userId ?? 0; $map['uc.user_id'] = $userId; unset($map['user_account']); From a76214ee2238f73dd5dd1997cc45edb3fc55b97c Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 17 Dec 2019 19:45:01 +0800 Subject: [PATCH 18/23] =?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/Controller/DownloadController.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Home/Controller/DownloadController.class.php b/Application/Home/Controller/DownloadController.class.php index 50395dd30..1f632a097 100644 --- a/Application/Home/Controller/DownloadController.class.php +++ b/Application/Home/Controller/DownloadController.class.php @@ -3233,7 +3233,7 @@ class DownloadController extends BaseController { ->field('sum(recharge_cost) recharge_cost,sum(recharge_count) recharge_count,sum(recharge_cost_today) as recharge_cost_today') ->find(); $userIds = array_column($roles, 'user_id'); - $userIds = $userIds ?? [-1]; + $userIds = $userIds ? $userIds : [-1]; $users = M('user', 'tab_')->where(array('id' => ['in', $userIds]))->getField('id, account', true); $csvFileName = $xlsName.'.csv'; //设置好告诉浏览器要下载excel文件的headers From ec2bbab76fd1120b3384a5312e66612cc784b7ba Mon Sep 17 00:00:00 2001 From: sunke <18850253506@163.com> Date: Tue, 17 Dec 2019 21:55:32 +0800 Subject: [PATCH 19/23] sever --- Application/Home/Controller/PlayersController.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Application/Home/Controller/PlayersController.class.php b/Application/Home/Controller/PlayersController.class.php index 2162efa41..53af22fda 100644 --- a/Application/Home/Controller/PlayersController.class.php +++ b/Application/Home/Controller/PlayersController.class.php @@ -77,9 +77,9 @@ class PlayersController extends BaseController { $rs[$key]['extend'] = encryption($v['extend']); $rs[$key]['create_time'] = date('Y-m-d H:i:s',$v['create_time']); $promoteInfo = M('promote','tab_')->field("account")->where(['id' => intval($v['promote_id'])])->find(); - $serverId = $v['server_id']; + $serverId1 = $v['server_id']; $gameId = $v['game_id']; - $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId,'game_id'=>$gameId])->find(); + $serverInfo = M('server','tab_')->field('server_name')->where(['server_num'=>$serverId1,'game_id'=>$gameId])->find(); $rs[$key]['server_name'] = $serverInfo['server_name']; $rs[$key]['promote_id']= $promoteInfo['account']; } From e5067479d775ff04dcb12570e7511b70b0429f64 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:11:03 +0800 Subject: [PATCH 20/23] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/js/recharge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js index 20448a92e..5efb55706 100644 --- a/Public/Media/js/recharge.js +++ b/Public/Media/js/recharge.js @@ -43,7 +43,7 @@ $(function() { var apitype = $("#apitype").val(); if (apitype == 'weixin') { var loading = new Cute.ui.dialog().loading('加载中...',{mask:true}); - Cute.api.post("/media.php/Recharge/beginPay",that.serialize(), function(json){ + Cute.api.post("/media.php?s=Recharge/beginPay",that.serialize(), function(json){ loading.close(); if(json.status > 0){ From c07ba38dbfdaee9002e3d15fde4f54a3479fa512 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:11:25 +0800 Subject: [PATCH 21/23] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Public/Media/js/recharge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Public/Media/js/recharge.js b/Public/Media/js/recharge.js index 5efb55706..0437178f6 100644 --- a/Public/Media/js/recharge.js +++ b/Public/Media/js/recharge.js @@ -43,7 +43,7 @@ $(function() { var apitype = $("#apitype").val(); if (apitype == 'weixin') { var loading = new Cute.ui.dialog().loading('加载中...',{mask:true}); - Cute.api.post("/media.php?s=Recharge/beginPay",that.serialize(), function(json){ + Cute.api.post("/media.php?s=/Recharge/beginPay",that.serialize(), function(json){ loading.close(); if(json.status > 0){ From 95f286fd3efbe9d5ff4ad0866a49b31ef255b9c0 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Tue, 17 Dec 2019 22:14:07 +0800 Subject: [PATCH 22/23] =?UTF-8?q?=E5=AE=98=E7=BD=91=E5=9C=B0=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Mobile/View/Index/business.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Mobile/View/Index/business.html b/Application/Mobile/View/Index/business.html index 949beb895..5eb2574b4 100644 --- a/Application/Mobile/View/Index/business.html +++ b/Application/Mobile/View/Index/business.html @@ -9,7 +9,7 @@ - +
From ef24feff131f6afeaf53d61ba238b493da9d5e0c Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Wed, 18 Dec 2019 11:12:33 +0800 Subject: [PATCH 23/23] =?UTF-8?q?=E5=AE=89=E5=8D=93=E8=90=BD=E5=9C=B0?= =?UTF-8?q?=E9=A1=B5=E8=A7=86=E9=A2=91=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/View/default/Home/landingPage2.html | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/Application/Home/View/default/Home/landingPage2.html b/Application/Home/View/default/Home/landingPage2.html index 494a43ef9..f61386b50 100644 --- a/Application/Home/View/default/Home/landingPage2.html +++ b/Application/Home/View/default/Home/landingPage2.html @@ -52,18 +52,16 @@
-
+
+ +
+ +
+ -
- - -
- -
- - +