浏览代码

debug push

stanley-king 7 年之前
父节点
当前提交
f6fb829990
共有 4 个文件被更改,包括 17 次插入5 次删除
  1. 2 2
      helper/async/register.php
  2. 5 0
      helper/model/member_info.php
  3. 9 2
      helper/push_helper.php
  4. 1 1
      mobile/control/login.php

+ 2 - 2
helper/async/register.php

@@ -59,14 +59,14 @@ class register extends IAsync
         if(empty($inviters)) return false;
 
         $level = 0;
-        $ex_invitee = $this->cur_user;
+//        $ex_invitee = $this->cur_user;
         foreach ($inviters as $inviter)
         {
             $this->reward_inviter($inviter,$level);
 //            $invitees = search\relation_client::instance()->fetch_invitees(['user_id' => $inviter]);
 //            $invitees = $this->ex_user($invitees,$ex_invitee);
 //            $this->reward_invitees($inviter,$invitees,$level);
-            $ex_invitee = $inviter;
+//            $ex_invitee = $inviter;
             $level += 1;
         }
         return true;

+ 5 - 0
helper/model/member_info.php

@@ -153,4 +153,9 @@ class member_info
     public function inviter_id() {
         return intval($this->member_info['inviter_id']);
     }
+
+    public function can_sms() {
+        $logtm = intval($this->member_info['member_login_time']);
+        return ($logtm > (time() - 180 * 86400));
+    }
 }

+ 9 - 2
helper/push_helper.php

@@ -188,11 +188,14 @@ class push_helper
             }
             else
             {
-                if(!empty($sms_type)) {
+                if(!empty($sms_type) && $alias_info->can_sms()) {
                     $sms_param['mobile'] = $mobile;
                     $sms_param['type'] = $sms_type;
                     QueueClient::push('sendSMS',$sms_param);
                 }
+                else {
+                    QueueClient::push('upushSendMsg',$push_param);
+                }
             }
         }
         else
@@ -203,10 +206,14 @@ class push_helper
             }
             else
             {
-                if(!empty($sms_type)) {
+                if(!empty($sms_type) && $alias_info->can_sms()) {
                     $sms = new Sms();
                     $status = $sms->send_oper($mobile,$sms_type,$sms_param);
                 }
+                else {
+                    $push = new push_sender();
+                    $status = $push->send($push_param,$client_type);
+                }
             }
         }
     }

+ 1 - 1
mobile/control/login.php

@@ -37,7 +37,7 @@ class loginControl extends mobileHomeControl
 
     public function statusOp()
     {
-        if ($_SESSION['is_login'] == '1') {
+        if (session_helper::logined()) {
             session::instance()->set_cookie($_SESSION['MPHPSESSID']);
             account_helper::onStatus($_SESSION['member_id']);
             return self::outsuccess(['member_id' => $_SESSION['member_id'],'HPHPSESSID' => $_SESSION['MPHPSESSID'],'userinfo' => $this->userinfo()]);