From 7d70f856ce1ae51527cd5f136e3c04e5cf27989d Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Wed, 27 Nov 2019 15:38:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=8E=A9=E5=AE=B6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/MemberController.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 0d6029bf6..fd7a178c4 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -169,14 +169,16 @@ class MemberController extends ThinkController $map['is_platform'] = 0; //数据 $usermodel = M('user', 'tab_'); - $sql1 = $usermodel->field('tab_user.*,IFNULL(sum(b.pay_amount),0) as deposit_total') + + $userField = "tab_user.id,device_number,age_status,account,balance,gold_coin,alipay,tab_user.promote_id,register_type,tab_user.promote_account,register_time,lock_status,register_way,register_ip,login_time,check_status"; + + $sql1 = $usermodel->field("{$userField},IFNULL(sum(b.pay_amount),0) as deposit_total") ->join('left join tab_deposit AS b ON tab_user.id = b.user_id AND b.pay_status = 1') ->where($map) ->group('tab_user.id') ->where($hav) // ->order($order) ->select(false); - // $data = $usermodel->table('(' . $sql1 . ') as a ')->field('a.id,a.device_number,a.age_status,a.account,a.balance,a.gold_coin,a.alipay,a.promote_id,a.register_type,a.promote_account,a.register_time,a.lock_status,a.register_way,a.register_type,a.register_ip,a.login_time,IFNULL(sum(ss.pay_amount),0) as recharge_total,check_status') // ->join('left join tab_spend as ss on ss.user_id=a.id AND ss.pay_status = 1') // ->join($game_map ? "tab_user_play on tab_user_play.user_id = a.id $game_map" : false) @@ -209,7 +211,6 @@ class MemberController extends ThinkController ->select(); } - //计数 $sql = M('user', 'tab_')->field('tab_user.id,IFNULL(sum(ss.pay_amount),0) AS recharge_total') ->join('left join tab_spend as ss on ss.user_id=tab_user.id AND ss.pay_status = 1') From e8ed8f808b7cefe62f2eba47ea051e38a55f384b Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 27 Nov 2019 15:47:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/ConsoleController.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Application/Admin/Controller/ConsoleController.class.php b/Application/Admin/Controller/ConsoleController.class.php index 71ff3486e..4001dfba5 100644 --- a/Application/Admin/Controller/ConsoleController.class.php +++ b/Application/Admin/Controller/ConsoleController.class.php @@ -94,9 +94,10 @@ class ConsoleController extends Think { $this->modifyLogin(1569686400); } - public function modifyLoginGenerate() + public function modifyLoginGenerate($start_time=0) { - $this->modifyLogin(strtotime(date("Y-m-d"))-86400); + $start_time = $start_time ? $start_time : date('Y-m-d', strtotime('-1 day')); + $this->modifyLogin(strtotime($start_time)); } /** From 3f8168c11a491184d0f5da8641c8b6b16a69e978 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 27 Nov 2019 16:04:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9F=AD?= =?UTF-8?q?=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/ToolController.class.php | 2 +- Application/Admin/View/Tool/smsset.html | 72 ++++++++++++++++--- 2 files changed, 62 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/ToolController.class.php b/Application/Admin/Controller/ToolController.class.php index 5d36aab97..638c75b80 100644 --- a/Application/Admin/Controller/ToolController.class.php +++ b/Application/Admin/Controller/ToolController.class.php @@ -125,7 +125,7 @@ class ToolController extends ThinkController { */ public function smsset($value='') { - $this->BaseConfig("sms_set,alidayu,jiguang,alidayunew"); + $this->BaseConfig("sms_set,alidayu,jiguang,alidayunew,zhongwang"); $this->meta_title = '短信设置'; $this->m_title = '短信设置'; diff --git a/Application/Admin/View/Tool/smsset.html b/Application/Admin/View/Tool/smsset.html index 415d582f4..0b0be71a3 100644 --- a/Application/Admin/View/Tool/smsset.html +++ b/Application/Admin/View/Tool/smsset.html @@ -9,6 +9,7 @@
  • 阿里大鱼（老）
  • 极光
  • 阿里大鱼（新）
    • +
  • 中网

    • {$meta_title}

    用于配置短信通知功能相关参数的功能

    @@ -297,17 +298,66 @@ - - -
    - -
    - - -
    - 已添加添加至常用设置 -
    - +
    +
    +
    + + + + + + + + + + + + + + + + + + + + +
    账号 + + 账号 +
    密码 + + 密码 +
    每日IP发送数量 + + 0或空则不限制 +
    启用状态 + + + + + 短信设置启用状态 +
    + + + +
    +
    +
    + + +
    + +
    + + +
    + 已添加添加至常用设置 +
    + From ede4cdd96ee17e26bf2c07bb13d601b880610acf Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 27 Nov 2019 16:16:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/Tool/smsset.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Application/Admin/View/Tool/smsset.html b/Application/Admin/View/Tool/smsset.html index 0b0be71a3..600385b37 100644 --- a/Application/Admin/View/Tool/smsset.html +++ b/Application/Admin/View/Tool/smsset.html @@ -299,7 +299,7 @@
    -
    +