Date: Mon, 13 Jan 2020 18:14:33 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=80=BB=E6=B5=81=E6=B0=B4=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Query/marketList.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/Application/Admin/View/Query/marketList.html b/Application/Admin/View/Query/marketList.html
index 8cfddb092..bc653c222 100644
--- a/Application/Admin/View/Query/marketList.html
+++ b/Application/Admin/View/Query/marketList.html
@@ -265,6 +265,7 @@
console.log(game_name)
console.log(count_date)
console.log(device)
+ $(".tooltiptext").hide();
if ($(_this).children().children().text()=='') {
$.ajax({
url: "{:U('Query/getChannelStream')}",
From 5a633ccb495b64f9eee496a3b4f15e8bbfff7dee Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 13 Jan 2020 18:17:37 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=BD=92=E5=B1=9E?=
=?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=97=B6=E9=97=B4=E6=97=A5=E6=9C=9F=E6=A0=BC?=
=?UTF-8?q?=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Promote/belong.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html
index a9a61708a..ae7200bee 100644
--- a/Application/Admin/View/Promote/belong.html
+++ b/Application/Admin/View/Promote/belong.html
@@ -181,7 +181,7 @@
只维护
- | {$data['applicant_time']} |
+ {:set_show_time($data['applicant_time'])} |
{$data['remark']} |
From 7770fc13c829c0b82e8e843b1a4fb42a678c880c Mon Sep 17 00:00:00 2001
From: zhengyongxing
Date: Mon, 13 Jan 2020 18:18:33 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=80=BB=E6=B5=81=E6=B0=B4=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Query/marketList.html | 1 +
1 file changed, 1 insertion(+)
diff --git a/Application/Admin/View/Query/marketList.html b/Application/Admin/View/Query/marketList.html
index bc653c222..d40ec8aaf 100644
--- a/Application/Admin/View/Query/marketList.html
+++ b/Application/Admin/View/Query/marketList.html
@@ -280,6 +280,7 @@
});
} else {
$(_this).children().toggle();
+ $(_this).children().toggle();
}
}
From 16814af0d2039814fcbe9fb4fbfb89a1e657be5c Mon Sep 17 00:00:00 2001
From: zhengyongxing
Date: Mon, 13 Jan 2020 18:29:31 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=80=BB=E6=B5=81=E6=B0=B4=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/View/Query/marketList.html | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Application/Admin/View/Query/marketList.html b/Application/Admin/View/Query/marketList.html
index d40ec8aaf..61ab31b83 100644
--- a/Application/Admin/View/Query/marketList.html
+++ b/Application/Admin/View/Query/marketList.html
@@ -265,7 +265,9 @@
console.log(game_name)
console.log(count_date)
console.log(device)
+ var display=$(_this).children().css('display');
$(".tooltiptext").hide();
+ console.log(display)
if ($(_this).children().children().text()=='') {
$.ajax({
url: "{:U('Query/getChannelStream')}",
@@ -279,8 +281,11 @@
}
});
} else {
- $(_this).children().toggle();
- $(_this).children().toggle();
+
+ $(_this).children().toggle();
+ if(display!='none') {
+ $(_this).children().toggle();
+ }
}
}
From 86fe5f1f9f47b3c0336121899b887c412f691659 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Mon, 13 Jan 2020 18:30:32 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=BD=92=E5=B1=9Eadmin?=
=?UTF-8?q?=E4=B8=8D=E5=8A=A0=E5=AF=86=E6=8E=A8=E5=B9=BF=E5=91=98=E8=B4=A6?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/PromoteController.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 980172d46..1a8e4f3d8 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -1230,7 +1230,7 @@ class PromoteController extends ThinkController
if ($page) {
$this->assign('_page', $page);
}
-
+ $this->assign('is_admin', is_administrator());
$this->assign('list_data', $list_data);
$this->display();
}
From 43a335bc28bbf65ffd2e8852c45fa2dd357ae9f5 Mon Sep 17 00:00:00 2001
From: zhengyongxing
Date: Mon, 13 Jan 2020 22:17:32 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E7=BB=93=E7=AE=97?=
=?UTF-8?q?=E7=AE=A1=E7=90=86=E6=80=BB=E6=B5=81=E6=B0=B4=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/AjaxController.class.php | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index a92e4fd6f..d837eafe7 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -362,14 +362,18 @@ class AjaxController extends ThinkController{
}
// var_dump($map);die();
if ($_REQUEST['company_id']) {
- $map['company_id'] = $_REQUEST['company_id'];
+ $map['_string'] = "tab_promote.company_id={$_REQUEST['company_id']} and ext_field is null";
}
+// $map['widthdraw_number'] = ['neq',''];
+
$data = M("withdraw","tab_")
- ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
+ ->field("widthdraw_number,promote_account,tab_promote_company.id as company_id,tab_promote_company.company_name,tab_withdraw.settlement_type,mobile_phone,real_name,bank_card,account_openin,address,game_ratio,bank_account")
->join("left join tab_promote on tab_withdraw.promote_id=tab_promote.id")
->join("left join tab_promote_company on tab_promote.company_id=tab_promote_company.id")
+ ->join("left join tab_statement as statement on tab_withdraw.widthdraw_number = statement.ext_field")
->where($map)
+// ->where("widthdraw_number is not NULL")
->select();
From 48ca90bbf35fd2c1666e6dc57d4959a4a299d376 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 14 Jan 2020 11:23:01 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90?=
=?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Admin/Controller/AutoController.class.php | 25 ++++++++-----------
1 file changed, 10 insertions(+), 15 deletions(-)
diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php
index e75d464ac..a441c54f0 100644
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@@ -1083,22 +1083,17 @@ public function auto_rrdae(){
$error_repeat = 0;
if (!empty($promotes)) {
- switch ($settlement) {
- case 1:
- $fun = 'promoteWithdrawWeeklyByPromote';
- break;
- case 2:
- $fun = 'promoteWithdrawPerMonthByPromote';
- break;
- case 3:
- $fun = 'promoteWithdrawRecoupByPromote';
- break;
- }
foreach ($promotes as $promote) {
- if ($fun == 'promoteWithdrawRecoupByPromote') {
- $result = $withdrawModel->$fun($promote);
- } else {
- $result = $withdrawModel->$fun($promote, $initial);
+ switch ($settlement) {
+ case 1:
+ $result = $withdrawModel->promoteWithdrawWeeklyByPromote($promote, $initial);
+ break;
+ case 2:
+ $result = $withdrawModel->promoteWithdrawRecoupByPromote($promote, $initial);
+ break;
+ case 3:
+ $result = $withdrawModel->promoteWithdrawRecoupByPromote($promote);
+ break;
}
switch ($result) {
case -4:
From 517d4ec05f5debf470104f145e07d1110a1395bf Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 14 Jan 2020 11:25:43 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=86=E6=88=90?=
=?UTF-8?q?=E7=AE=A1=E7=90=86--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Admin/Controller/AutoController.class.php | 26 +++++++++++--------
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git a/Application/Admin/Controller/AutoController.class.php b/Application/Admin/Controller/AutoController.class.php
index a441c54f0..ba3504d8e 100644
--- a/Application/Admin/Controller/AutoController.class.php
+++ b/Application/Admin/Controller/AutoController.class.php
@@ -1070,7 +1070,6 @@ public function auto_rrdae(){
private function promoteWithdraw($settlement = 1, $initial = false)
{
$withdrawModel = new WithdrawModel();
- $map['id'] = 84;
$map['level'] = 1;
$map['ver_status'] = 1;
$map['settlement_type'] = ($settlement == 3) ? 1 : $settlement;
@@ -1083,17 +1082,22 @@ public function auto_rrdae(){
$error_repeat = 0;
if (!empty($promotes)) {
+ switch ($settlement) {
+ case 1:
+ $fun = 'promoteWithdrawWeeklyByPromote';
+ break;
+ case 2:
+ $fun = 'promoteWithdrawPerMonthByPromote';
+ break;
+ case 3:
+ $fun = 'promoteWithdrawRecoupByPromote';
+ break;
+ }
foreach ($promotes as $promote) {
- switch ($settlement) {
- case 1:
- $result = $withdrawModel->promoteWithdrawWeeklyByPromote($promote, $initial);
- break;
- case 2:
- $result = $withdrawModel->promoteWithdrawRecoupByPromote($promote, $initial);
- break;
- case 3:
- $result = $withdrawModel->promoteWithdrawRecoupByPromote($promote);
- break;
+ if ($fun == 'promoteWithdrawRecoupByPromote') {
+ $result = $withdrawModel->$fun($promote);
+ } else {
+ $result = $withdrawModel->$fun($promote, $initial);
}
switch ($result) {
case -4:
From 63d947f7549e5d6575d0284617a261561a568d9a Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Tue, 14 Jan 2020 11:28:46 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E6=8F=90=E7=8E=B0--?=
=?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/Admin/Controller/QueryController.class.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/Application/Admin/Controller/QueryController.class.php b/Application/Admin/Controller/QueryController.class.php
index f2718ef75..0b3f21d51 100644
--- a/Application/Admin/Controller/QueryController.class.php
+++ b/Application/Admin/Controller/QueryController.class.php
@@ -1352,6 +1352,7 @@ class QueryController extends ThinkController
foreach ($gameRatios as $gameId => $gameRatio) {
$gameName = D('game')->where(array('id' => $gameId))->getField('game_name');
foreach ($gameRatio as $list) {
+ $list['selle_ratio'] = $list['selle_ratio'] ?? '0.00';
$records[] = [
'settlement_time' => "{$list['begin_time']} - {$list['end_time']}",
'game_name' => $gameName ?? '未知',
From 38cea3f97257847f6babe127ba1bdefe6935d003 Mon Sep 17 00:00:00 2001
From: zhengyongxing
Date: Tue, 14 Jan 2020 13:46:55 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=94=81=E5=AE=9A=E5=A4=87=E6=B3=A8bug?=
=?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/MemberController.class.php | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php
index 4294b4d15..1c5a26ada 100644
--- a/Application/Admin/Controller/MemberController.class.php
+++ b/Application/Admin/Controller/MemberController.class.php
@@ -204,9 +204,13 @@ class MemberController extends ThinkController
$v['login_time'] = date('Y-m-d H:i:s',$v['login_time']);
$v['lock_status'] = get_info_status($v['lock_status'],4);
$v['check_status'] = $v['check_status']==1 ? "正常" :"拉黑";
+ if($v['lock_status'] != '锁定') {
+ $v['lock_remark'] = '';
+ }
+// dump($v['lock_status']);
// $data[$k] = $v;
}
-
+// die();
$field = array(
"id"=>"账号ID","account"=>"玩家账号","promote_account"=>"所属推广员","balance"=>"账户平台币","recharge_total"=>"累计充值","gold_coin"=>"金币",
"vip_level"=>"VIP等级","register_type"=>"注册方式","register_time"=>"注册时间","register_ip"=>"注册IP","login_time"=>"最后登录时间",
|