From d9b54f8973b678d67772bd4ac75b9e9838e7813f Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Tue, 31 Mar 2020 19:08:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?OA=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FengHuoApi2Controller.class.php | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/Application/Sdk/Controller/FengHuoApi2Controller.class.php b/Application/Sdk/Controller/FengHuoApi2Controller.class.php index 877e2b19..c41c1ff7 100644 --- a/Application/Sdk/Controller/FengHuoApi2Controller.class.php +++ b/Application/Sdk/Controller/FengHuoApi2Controller.class.php @@ -241,27 +241,33 @@ class FengHuoApi2Controller extends GetInfoBaseController{ // 默认排序：id降序 $order = 'login_time asc'; - $where['login_time'] = array('neq',0); +// $where['login_time'] = array('neq',0); $data = M('user_login_record','tab_') - ->field('user_id,game_name,server_name,login_time,user_account,game_player_name') + ->field('tab_user_login_record.id,tab_user_login_record.id,user_id,game_name,server_name,login_time,user_account,game_player_name,CASE WHEN promote_id = 0 THEN "官方渠道" ELSE account END as promote_account') + ->join("left join tab_promote as promote on tab_user_login_record.promote_id=promote.id") ->where($where) ->order($order) ->page($page, $row) ->select(); - foreach ($data as $k=>$v){ - $promoteId = $v['promote_id']; - if($promoteId == 0){ - $data[$k]['promote_account'] = '官方渠道'; - }else{ - $promote_account = M('promote','tab_') - ->field('account') - ->where('id',$promoteId) - ->find(); - $data[$k]['promote_account'] = $promote_account; - } - } +// echo $data;die(); +// foreach ($data as $k=>$v){ +// $promoteId = $v['promote_id']; +// if($promoteId == 0){ +// $data[$k]['promote_account'] = '官方渠道'; +// }else{ +// $promote_account = M('promote','tab_') +// ->field('account') +// ->where('id',$promoteId) +// ->find(); +// +// $data[$k]['promote_account'] = $promote_account; +// } +// +// } + +// dump($data);die(); if($data){ $result = [ From 8c5f60525f364a4eab4571d5b0a0f537223ff1fb Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 3 Apr 2020 14:05:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/GameGiftPage/details.html | 2 +- Application/Sdk/View/default/GameGiftPage/lists.html | 2 +- Application/Sdk/View/default/GameGiftPage/receive.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Sdk/View/default/GameGiftPage/details.html b/Application/Sdk/View/default/GameGiftPage/details.html index e9b549e4..c7ee7526 100644 --- a/Application/Sdk/View/default/GameGiftPage/details.html +++ b/Application/Sdk/View/default/GameGiftPage/details.html @@ -19,7 +19,7 @@

{$content.giftbag_name}

-

剩余{$content.novice_num}个

+
激活码：{$novice}
diff --git a/Application/Sdk/View/default/GameGiftPage/lists.html b/Application/Sdk/View/default/GameGiftPage/lists.html index f024e3ee..edc467ca 100644 --- a/Application/Sdk/View/default/GameGiftPage/lists.html +++ b/Application/Sdk/View/default/GameGiftPage/lists.html @@ -20,7 +20,7 @@

{$game.game_name}

-

礼包总数{$game.gift_num}

+
diff --git a/Application/Sdk/View/default/GameGiftPage/receive.html b/Application/Sdk/View/default/GameGiftPage/receive.html index 10681e34..f36a36e3 100644 --- a/Application/Sdk/View/default/GameGiftPage/receive.html +++ b/Application/Sdk/View/default/GameGiftPage/receive.html @@ -32,7 +32,7 @@

{$content.giftbag_name}

-

剩余{$content.novice_num}个

+
From 46b5e5948a8f4ab9d1b9fb5a6a2dffe3debb19eb Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Fri, 3 Apr 2020 14:09:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E6=80=BB=E6=95=B0=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Sdk/View/default/GameGiftPage/details.html | 2 +- Application/Sdk/View/default/GameGiftPage/lists.html | 2 +- Application/Sdk/View/default/GameGiftPage/receive.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Application/Sdk/View/default/GameGiftPage/details.html b/Application/Sdk/View/default/GameGiftPage/details.html index e9b549e4..c7ee7526 100644 --- a/Application/Sdk/View/default/GameGiftPage/details.html +++ b/Application/Sdk/View/default/GameGiftPage/details.html @@ -19,7 +19,7 @@

{$content.giftbag_name}

-

剩余{$content.novice_num}个

+
激活码：{$novice}
diff --git a/Application/Sdk/View/default/GameGiftPage/lists.html b/Application/Sdk/View/default/GameGiftPage/lists.html index f024e3ee..edc467ca 100644 --- a/Application/Sdk/View/default/GameGiftPage/lists.html +++ b/Application/Sdk/View/default/GameGiftPage/lists.html @@ -20,7 +20,7 @@

{$game.game_name}

-

礼包总数{$game.gift_num}

+
diff --git a/Application/Sdk/View/default/GameGiftPage/receive.html b/Application/Sdk/View/default/GameGiftPage/receive.html index 10681e34..f36a36e3 100644 --- a/Application/Sdk/View/default/GameGiftPage/receive.html +++ b/Application/Sdk/View/default/GameGiftPage/receive.html @@ -32,7 +32,7 @@

{$content.giftbag_name}

-

剩余{$content.novice_num}个

+