refactor login_helper::onBinded function

data/model/user_bonus.model.php

@@ -114,8 +114,8 @@ class user_bonusModel extends Model
         }
     }
 
-    private function getOwned($mobile,$type_id,$fields = '*') {
-        return  $this->where(array('user_mobile' => $mobile, 'type_id' => $type_id,'bonus_status' => array('in',array(2,3))))->field($fields)->find();
+    private function getOwned($mobile,$userid,$type_id,$fields = '*') {
+        return  $this->where(array('user_mobile|user_id' => ['_multi' => true,$mobile,$userid], 'type_id' => $type_id,'bonus_status' => array('in',array(2,3))))->field($fields)->find();
     }
 
     public function edit($condition,$datas)
@@ -128,7 +128,7 @@ class user_bonusModel extends Model
     }
 
     //返回单个红包
-    public function grab($type_id,$time_out,$mobile,$sess_id,&$is_new_grab,&$is_new_bind)
+    public function grab($type_id,$time_out,$mobile,$sess_id,$user_id,&$is_new_grab,&$is_new_bind)
     {
         $is_new_grab = false;
         $is_new_bind = false;
@@ -137,7 +137,7 @@ class user_bonusModel extends Model
         //如果已经绑定手机
         if(!empty($mobile))
         {
-            $mine = $this->getOwned($mobile,$type_id,$fields);
+            $mine = $this->getOwned($mobile,$user_id,$type_id,$fields);
             if(!empty($mine)) {
                 return $mine;
             }
@@ -183,13 +183,13 @@ class user_bonusModel extends Model
         $cond['get_time']  = $bonus['get_time'];
         $cond['session_id']  = $bonus['session_id'];
 
-        if(session_helper::isLogin()) { // 如果是登录状态直接绑定
+        if(session_helper::logined()) { // 如果是登录状态直接绑定
             $datas = array('bonus_status' => 2,
                 'grab_time' => time(),
                 'get_time'  => time(),
                 'session_id' => $sess_id,
-                'user_id' => $_SESSION['member_id'],
-                'user_mobile' => session_helper::cur_mobile(),
+                'user_id' => session_helper::memberid(),
+                'user_mobile' => session_helper::mobile(),
                 'user_name' => session_helper::nickname());
             $is_new_bind = true;
         }
@@ -198,7 +198,8 @@ class user_bonusModel extends Model
                 'grab_time' => time(),
                 'get_time'  => time(),
                 'session_id' => $sess_id,
-                'user_mobile' => session_helper::cur_mobile());
+                'user_id' => session_helper::memberid(),
+                'user_mobile' => session_helper::mobile());
             $is_new_bind = true;
         }
         else {
@@ -219,21 +220,22 @@ class user_bonusModel extends Model
         }
     }
 
-    public function bind($type_id,$bonus_id,$sess_id,$mobile,&$bonus)
+    public function bind($type_id,$bonus_id,$sess_id,$mobile,$userid,&$bonus)
     {
         $fields = '*';
-        $items = $this->getOwned($mobile, $type_id, $fields);
+        $items = $this->getOwned($mobile, $userid, $type_id, $fields);
         if (!empty($items)) {
             $bonus = $items;
             return false;
         }
 
-        $condition = array('type_id' => $type_id, 'bonus_id' => $bonus_id, 'session_id' => $sess_id, 'bonus_status' => 1);
-        $datas = array('bonus_status' => 2,
-            'user_mobile' => $mobile,
-            'get_time' => time());
+        $condition = ['type_id' => $type_id, 'bonus_id' => $bonus_id, 'session_id' => $sess_id,'bonus_status' => 1];
+        $datas = ['bonus_status' => 2,
+                  'user_mobile' => $mobile,
+                  'user_id' => $userid,
+                  'get_time' => time()];
 
-        if (session_helper::isLogin()) {
+        if (session_helper::logined()) {
             $datas['user_name'] = session_helper::nickname();
             $datas['user_id'] = $_SESSION['member_id'];
         }

helper/bonus/grab.php

@@ -47,14 +47,15 @@ class general_grab extends IGrab
 
         $time_out = $paramer['time_out'];
         $session_id = $paramer['session_id'];
-        $mobile = $paramer['mobile'];
+        $mobile = $paramer['user_mobile'];
+        $user_id = $paramer['user_id'];
         $type_id = $this->mType->getType_id();
 
         $user_bonus = Model('user_bonus');
 
         $is_new_grab = false;
         $is_new_bind = false;
-        $bonus = $user_bonus->grab($type_id,$time_out,$mobile,$session_id,$is_new_grab,$is_new_bind);
+        $bonus = $user_bonus->grab($type_id,$time_out,$mobile,$session_id,$user_id,$is_new_grab,$is_new_bind);
 
         if(!empty($bonus))
         {

helper/bonus/manager.php

@@ -115,32 +115,37 @@ class manager
         {
             $mod_bonus = Model('user_bonus');
 
-            $session_id = $_SESSION['MPHPSESSID'];
-            if(session_helper::isVerfiyMobile()) {
-                $mobile = session_helper::cur_mobile();
-                $sql = "select * from lrlz_user_bonus where type_sn = '{$type_sn}' and (session_id = '{$session_id}' or user_mobile = '{$mobile}')";
-            } else {
-                $sql = "select * from lrlz_user_bonus where type_sn = '{$type_sn}' and session_id = '{$session_id}'";
+            $session_id = session_helper::session_id();
+            $mobile = session_helper::mobile();
+            $user_id = session_helper::memberid();
+            if(empty($session_id)) return false;
+
+            if($user_id > 0 && !empty($mobile)) {
+                $cond['session_id|user_mobile|user_id'] = ['_multi'=> true,$session_id,$mobile,$user_id];
+            }
+            elseif ($user_id > 0) {
+                $cond['session_id|user_id'] = ['_multi'=> true,$session_id,$user_id];
+            }
+            elseif (!empty($mobile)) {
+                $cond['session_id|user_mobile'] = ['_multi'=> true,$session_id,$mobile];
             }
-            $bonusex = $mod_bonus->get_by_sql($sql);
+            else {
+                $cond['session_id'] = $session_id;
+            }
+            $cond['type_sn'] = $type_sn;
 
+            $bonusex = $mod_bonus->get($cond);
             if(empty($bonusex)) {
                 return false;
             }
-            if(count($bonusex) > 1)
+
+            foreach($bonusex as $val)
             {
-                foreach($bonusex as $val)
-                {
-                    if($val['user_mobile'] == $_SESSION['member_mobile']) {
-                        $this->write_session($val);
-                        return $val;
-                    }
+                if($val['user_mobile'] == session_helper::mobile()) {
+                    $this->write_session($val);
+                    return $val;
                 }
             }
-            else {
-                $this->write_session($bonusex[0]);
-                return $bonusex[0];
-            }
         }
 
         return $bonus;
@@ -152,32 +157,38 @@ class manager
         if(empty($bonus))
         {
             $mod_bonus = Model('user_bonus');
-            $session_id = $_SESSION['MPHPSESSID'];
-            if(session_helper::isVerfiyMobile()) {
-                $mobile = session_helper::cur_mobile();
-                $sql = "select * from lrlz_user_bonus where bonus_sn = '{$bonus_sn}' and (session_id = '{$session_id}' or user_mobile = '{$mobile}')";
-            } else {
-                $sql = "select * from lrlz_user_bonus where bonus_sn = '{$bonus_sn}' and session_id = '{$session_id}'";
+
+            $session_id = session_helper::session_id();
+            $mobile = session_helper::mobile();
+            $user_id = session_helper::memberid();
+            if(empty($session_id)) return false;
+
+            if($user_id > 0 && !empty($mobile)) {
+                $cond['session_id|user_mobile|user_id'] = ['_multi'=> true,$session_id,$mobile,$user_id];
+            }
+            elseif ($user_id > 0) {
+                $cond['session_id|user_id'] = ['_multi'=> true,$session_id,$user_id];
+            }
+            elseif (!empty($mobile)) {
+                $cond['session_id|user_mobile'] = ['_multi'=> true,$session_id,$mobile];
             }
-            $bonusex = $mod_bonus->get_by_sql($sql);
+            else {
+                $cond['session_id'] = $session_id;
+            }
+            $cond['bonus_sn'] = $bonus_sn;
+
+            $bonusex = $mod_bonus->get($cond);
             if(empty($bonusex)) {
                 return false;
             }
 
-            if(count($bonusex) > 1)
+            foreach($bonusex as $val)
             {
-                foreach($bonusex as $val)
-                {
-                    if($val['user_mobile'] == $_SESSION['member_mobile']) {
-                        $this->write_session($val);
-                        return $val;
-                    }
+                if($val['user_mobile'] == $_SESSION['member_mobile']) {
+                    $this->write_session($val);
+                    return $val;
                 }
             }
-            else {
-                $this->write_session($bonusex[0]);
-                return $bonusex[0];
-            }
         }
 
         return $bonus;
@@ -189,10 +200,11 @@ class manager
         $bonus = $this->read_session($type_sn);
         if($bonus === false)
         {
-            $param = array( 'type_sn' => $type_sn,
-                'session_id' => $_SESSION['MPHPSESSID'],
-                'time_out' => self::grab_period_timeout,
-                'member_mobile' => $_SESSION['member_mobile']);
+            $param = ['type_sn' => $type_sn,
+                        'session_id' => session_helper::session_id(),
+                        'time_out' => self::grab_period_timeout,
+                        'user_mobile' => session_helper::mobile(),
+                        'user_id' => session_helper::memberid()];
 
             $bonus_obj = factory::grab_bonus($param);
             if($bonus_obj == false) {
@@ -369,7 +381,7 @@ class manager
         }
     }
 
-    public function bind_bonus($bonus_sn,$session_id,$mobile,&$new_bonus_sn)
+    public function bind_bonus($bonus_sn,$session_id,$mobile,$userid,&$new_bonus_sn)
     {
         $new_bonus_sn = $bonus_sn;
         $bonus_info = self::read_session('',$bonus_sn);
@@ -389,7 +401,7 @@ class manager
             $user_bonus = user_bonus::create_by_sn($bonus_sn);
             if($user_bonus->isBinded())
             {
-                if($user_bonus->user_mobile() == $mobile) {
+                if($user_bonus->user_mobile() == $mobile || $user_bonus->user_id() == $userid) {
                     return true;
                 } else {
                     return false;
@@ -401,7 +413,7 @@ class manager
         }
 
         $binded_bonus = array();
-        $ret = Model('user_bonus')->bind($type_id,$bonus_id,$session_id,$mobile,$binded_bonus);
+        $ret = Model('user_bonus')->bind($type_id,$bonus_id,$session_id,$mobile,$userid,$binded_bonus);
         Log::record("bind_bonus bind ret={$ret}",Log::DEBUG);
         if($ret == true)
         {

helper/bonus_helper.php

@@ -126,12 +126,12 @@ class bonus_helper
         return $manager->grab_bonus($type_sn);
     }
 
-    static public function bind_bonus($bonus_sn,$session_id,$mobile,&$new_bonus_sn)
+    static public function bind_bonus($bonus_sn,$session_id,$mobile,$userid,&$new_bonus_sn)
     {
         try
         {
             $manager = new \bonus\manager();
-            return $manager->bind_bonus($bonus_sn,$session_id,$mobile,$new_bonus_sn);
+            return $manager->bind_bonus($bonus_sn,$session_id,$mobile,$userid,$new_bonus_sn);
         } catch (Exception $ex) {
             return array($ex->getCode(),$ex->getMessage());
         }
@@ -350,5 +350,4 @@ class bonus_helper
         $scaler = new \bonus\scaler($rate_moneys);
         return $scaler->calc();
     }
-
 }

helper/login/ilogin.php

@@ -129,7 +129,7 @@ abstract class ILogin
         }
 
         $ret = $mod_member->editMember(array('member_id' => $this->mMemberId), $update);
-        if($ret && $mod_member->affected_rows > 0) {
+        if($ret && $mod_member->affected_rows() > 0) {
             return true;
         } else {
             return false;
@@ -160,7 +160,7 @@ abstract class ILogin
         $this->mMemberInfo['member_sex'] = $member->sex();
 
         $ret = $mod_member->editMember(array('member_id' => $this->mMemberId), $update);
-        if($ret && $mod_member->affected_rows > 0) {
+        if($ret && $mod_member->affected_rows() > 0) {
             return true;
         } else {
             return false;
@@ -173,7 +173,7 @@ abstract class ILogin
 
         $mod_member = Model('member');
         $ret = $mod_member->editMember(['member_id' => $this->mMemberId], ['member_mobile' => ""]);
-        if($ret && $mod_member->affected_rows > 0) {
+        if($ret && $mod_member->affected_rows() > 0) {
             return true;
         } else {
             return false;

helper/login/mobile_log.php

@@ -29,31 +29,31 @@ class mobile_log extends ILogin
             return true;
         }
     }
-    public function register($passwd,$user_info,$relay_id = 0)
-    {
-        $info['member_mobile'] = $this->mMobile;
-        $info['member_type'] = ILogin::mobile_login;
-        $info['member_passwd'] =  $passwd;
-        $info['member_name'] =  $this->mMobile;
-        $info['member_mobile_bind'] = 1;
-        $info['inviter_id'] = $relay_id;
-
-        if(empty($user_info)) {
-            $info['member_sex'] = 0;
-            $info['member_nickname'] = substr_replace($this->mMobile, '****', 3, 4);
-        } else {
-            $info['member_nickname']  = $user_info['nickname'];
-            $info['member_wxunionid'] = $user_info['unionid'];
-            $info['member_avatar']   = $user_info['headimgurl'];
-            $info['member_sex']      = intval($user_info['sex']);
-        }
-
-        $mod_member = Model('member');
-        $insert_id = $mod_member->addMember($info);
-        if($insert_id != false) {
-            $this->mMemberId = $insert_id;
-        }
-
-        return $insert_id;
-    }
+//    public function register($passwd,$user_info,$relay_id = 0)
+//    {
+//        $info['member_mobile'] = $this->mMobile;
+//        $info['member_type'] = ILogin::mobile_login;
+//        $info['member_passwd'] =  $passwd;
+//        $info['member_name'] =  $this->mMobile;
+//        $info['member_mobile_bind'] = 1;
+//        $info['inviter_id'] = $relay_id;
+//
+//        if(empty($user_info)) {
+//            $info['member_sex'] = 0;
+//            $info['member_nickname'] = substr_replace($this->mMobile, '****', 3, 4);
+//        } else {
+//            $info['member_nickname']  = $user_info['nickname'];
+//            $info['member_wxunionid'] = $user_info['unionid'];
+//            $info['member_avatar']   = $user_info['headimgurl'];
+//            $info['member_sex']      = intval($user_info['sex']);
+//        }
+//
+//        $mod_member = Model('member');
+//        $insert_id = $mod_member->addMember($info);
+//        if($insert_id != false) {
+//            $this->mMemberId = $insert_id;
+//        }
+//
+//        return $insert_id;
+//    }
 }

helper/login_helper.php

@@ -20,41 +20,31 @@ require_once(BASE_ROOT_PATH . '/helper/push_helper.php');
 class login_helper
 {
     //微信授权之后，并且验证码通过后的处理
-    public static function onBinded($mobile,$code,$relay_id=0)
+    public static function onBinded($mobile,$relay_id)
     {
         $logger = new login\mobile_log($mobile);
         if($logger->ismember() == true)
         {
-            $user_info = self::user_info();
-            if($user_info != false) {
+            if(wx_userinfo::has_userinfo()) {
+                $user_info = wx_userinfo::userinfo();
                 $logger->bind($user_info);
-                unset($_SESSION['wx_author']);
+                wx_userinfo::clear_wxinfo();
             }
             return $logger->login();
         }
         else
         {
-            $passwd = $code . substr($mobile, -4);
-            $user_info = self::user_info();
-            if($logger->register($passwd,$user_info,$relay_id) != false)
-            {
+            $user_info = [];
+            if(wx_userinfo::has_userinfo()) {
+                $user_info = wx_userinfo::userinfo();
+            }
+            if($logger->register($user_info,$relay_id,$mobile) != false) {
                 account_helper::onRegister($logger->memberid(),$relay_id);
-                unset($_SESSION['wx_author']);
+                wx_userinfo::clear_wxinfo();
                 return $logger->login();
             }
         }
 
         return false;
     }
-
-    private static function user_info()
-    {
-        if(array_key_exists('wx_author',$_SESSION)) {
-            if (array_key_exists('user_info', $_SESSION['wx_author'])) {
-                $user_info = $_SESSION['wx_author']['user_info'];
-                return $user_info;
-            }
-        }
-        return false;
-    }
 }

helper/predeposit_helper.php

@@ -337,7 +337,7 @@ class predeposit_helper
 
     static public function login_bonus_price($goods_price, &$rates)
     {
-        if(session_helper::isLogin())
+        if(session_helper::logined())
         {
             if(isset($_SESSION['bonus_rate']) == false) {
                 $pred = new predeposit_helper($_SESSION['member_id']);

helper/session_helper.php

@@ -80,11 +80,6 @@ class session_helper
         return '';
     }
 
-    static public function isLogin()
-    {
-        return ($_SESSION['is_login'] == 1);
-    }
-
     static public function logined()
     {
         return ($_SESSION['is_login'] == 1);
@@ -101,7 +96,7 @@ class session_helper
 
     static public function isVerfiyMobile()
     {
-        if (self::isLogin()) {
+        if (self::logined()) {
             return true;
         } else {
             if (isset($_SESSION['member_mobile']) && !empty($_SESSION['member_mobile'])) {
@@ -155,7 +150,7 @@ class session_helper
         }
     }
 
-    static public function cur_mobile()
+    static public function mobile()
     {
         if (self::isVerfiyMobile()) {
             return $_SESSION['member_mobile'];
@@ -272,7 +267,7 @@ class session_helper
                         unset($_SESSION['wx_author']);
                     }
                     else {
-                        $loginer->register($user_info,session_helper::relay_id(),session_helper::cur_mobile());
+                        $loginer->register($user_info,session_helper::relay_id(),session_helper::mobile());
                     }
                 }
 
@@ -491,7 +486,7 @@ class session_helper
         else
         {
             $mod_favorites = Model('goods_fcode');
-            $_SESSION['fcode_num'] = $mod_favorites->getUsableFcodeCount(self::cur_mobile());
+            $_SESSION['fcode_num'] = $mod_favorites->getUsableFcodeCount(self::mobile());
             return $_SESSION['fcode_num'];
         }
     }

helper/ugc/special.php

@@ -63,9 +63,9 @@ class submit_rule
             $params['bonus_value'] = $bonus_value;
             $params['remain_amount'] = $bonus_value;
             $params['bonus_sn'] = bonus\make_bonus_sn();
-            if(session_helper::isLogin()) {
+            if(session_helper::logined()) {
                 $params['user_id'] = session_helper::memberid();
-                $params['user_mobile'] = session_helper::cur_mobile();
+                $params['user_mobile'] = session_helper::mobile();
                 $params['user_name'] = session_helper::nickname();
                 $params['bonus_status'] = 2;
             } else {
@@ -76,7 +76,7 @@ class submit_rule
             $ret = $mod_bonus->add($params);
             if($ret != false)
             {
-                if(session_helper::isLogin()) {
+                if(session_helper::logined()) {
                     Model('bonus_type')->edit(['type_id' => $type->getType_id()],
                         array('grabed_num' => array('exp', 'grabed_num+1'),
                             'binded_num'   => array('exp', 'binded_num+1'),
@@ -123,7 +123,7 @@ class submit_rule
     {
         $mod_bonus = Model('user_bonus');
         $sessionid = session_helper::session_id();
-        if(session_helper::isLogin()) {
+        if(session_helper::logined()) {
             $member_id = session_helper::memberid();
             $cond['session_id|user_id'] = array('_multi'=>true,$sessionid,$member_id);
         }

helper/user_session/fcode.php

@@ -62,12 +62,12 @@ class fcode
     {
         $this->mCodes = [];
         $this->mDirty = true;
-        if(session_helper::logined() == false || empty(session_helper::cur_mobile())) {
+        if(session_helper::logined() == false || empty(session_helper::mobile())) {
             return;
         }
 
         $mod_fcode = Model('goods_fcode');
-        $fcodes = $mod_fcode->getFcodeList(['mobile' => session_helper::cur_mobile()]);
+        $fcodes = $mod_fcode->getFcodeList(['mobile' => session_helper::mobile()]);
 
         foreach ($fcodes as $item)
         {

mobile/control/bonusex.php

@@ -83,20 +83,20 @@ class bonusexControl extends mobileControl
             return self::outsuccess(array('type_info' => $type_info),"bonus/unstart");
         }
 
-        $grabable = bonus_helper::can_grab($type,$_SESSION['member_id'],$_SESSION['member_mobile']);
+        $grabable = bonus_helper::can_grab($type,session_helper::memberid(),session_helper::mobile());
         $mine_bonus = bonus_helper::get_mine_by_typesn($type_sn);
         if($mine_bonus != false)
         {   //显示我抢到的红包，按照状态进行判断
             $bonus = bonus\user_bonus::create_by_param($mine_bonus);
             $mine_bonus = bonus_helper::filter_bonus($mine_bonus);
 
-            if($bonus->isBinded() == false && session_helper::isVerfiyMobile())
+            if($bonus->isBinded() == false && (session_helper::logined() || session_helper::isVerfiyMobile()))
             {
                 if($grabable == false) {
                     return self::outsuccess(array('type_info' => $type_info,'msg' => "已注册用户不能领邀请红包～"),"bonus/over");
                 }
 
-                $ret = bonus_helper::bind_bonus($bonus->bonus_sn(),$_SESSION['MPHPSESSID'],session_helper::cur_mobile(),$new_sn);
+                $ret = bonus_helper::bind_bonus($bonus->bonus_sn(),session_helper::session_id(),session_helper::mobile(),session_helper::memberid(),$new_sn);
                 if($ret == true) {
                     $mine_bonus = bonus_helper::get_mine_by_bonussn($new_sn);
                 }
@@ -153,6 +153,7 @@ class bonusexControl extends mobileControl
             }
         }
     }
+
     public function detailOp()
     {
         if(!isset($_GET['type_sn']) || empty($_GET['type_sn'])) {
@@ -203,8 +204,7 @@ class bonusexControl extends mobileControl
             return self::outsuccess(array('type_info' => $type_info),"bonus/unstart");
         }
 
-        $grabable = bonus_helper::can_grab($type,$_SESSION['member_id'],$_SESSION['member_mobile']);
-
+        $grabable = bonus_helper::can_grab($type,session_helper::memberid(),session_helper::mobile());
         $mine_bonus = bonus_helper::get_mine_by_typesn($type_sn);
         if($mine_bonus != false)
         { //显示我抢到的红包，按照状态进行判断
@@ -225,13 +225,13 @@ class bonusexControl extends mobileControl
             }
             else
             {
-                if(session_helper::isVerfiyMobile())
+                if(session_helper::isVerfiyMobile() || session_helper::logined())
                 {
                     if($grabable == false) {
                         return self::outsuccess(array('type_info' => $type_info,'msg' => "已注册用户不能领邀请红包～"),"bonus/over");
                     }
 
-                    $ret = bonus_helper::bind_bonus($bonus_obj->bonus_sn(),$_SESSION['MPHPSESSID'],session_helper::cur_mobile(),$new_sn);
+                    $ret = bonus_helper::bind_bonus($bonus_obj->bonus_sn(),$_SESSION['MPHPSESSID'],session_helper::mobile(),session_helper::memberid(),$new_sn);
                     if($ret == true) {
                         $mine_bonus = bonus_helper::get_mine_by_bonussn($new_sn);
                         $summarys = $this->matched_goods($type_sn);
@@ -246,7 +246,8 @@ class bonusexControl extends mobileControl
                             'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,
                             'avatars' => $avatars),"bonus/bind");
                     }
-                } else {
+                }
+                else {
                     return self::outsuccess(array('type_info' => $type_info, 'mine_bonus' => $mine_bonus,'binded_info' => $binded_info,
                         'avatars' => $avatars),"bonus/bind");
                 }
@@ -336,7 +337,7 @@ class bonusexControl extends mobileControl
             return self::outsuccess(array('type_info' => $type_infos['type_info']),"bonus/end");
         }
         elseif(session_helper::isVerfiyMobile()) {
-            $mobile = session_helper::cur_mobile();
+            $mobile = session_helper::mobile();
         }
         else
         {
@@ -359,13 +360,13 @@ class bonusexControl extends mobileControl
             else
             {
                 $grabable = bonus_helper::can_grab($type,$_SESSION['member_id'],$mobile);
-                login_helper::onBinded($mobile,$code,session_helper::relay_id());
+                login_helper::onBinded($mobile,session_helper::relay_id());
             }
         }
 
         if($grabable)
         {
-            $ret = bonus_helper::bind_bonus($bonus_sn,$_SESSION['MPHPSESSID'],$mobile,$new_bonus_sn);
+            $ret = bonus_helper::bind_bonus($bonus_sn,session_helper::session_id(),$mobile,session_helper::memberid(),$new_bonus_sn);
             if($ret == true) {
                 $mine_bonus = bonus_helper::get_mine_by_bonussn($new_bonus_sn);
                 $bonus_obj = \bonus\user_bonus::create_by_param($mine_bonus);
@@ -672,7 +673,7 @@ function bonus_output_present($output)
 {
     if(session_helper::first_order() == false) return;
 
-    $fcode = fcode\present_manager::instance()->fetch(session_helper::cur_mobile(),session_helper::session_id());
+    $fcode = fcode\present_manager::instance()->fetch(session_helper::mobile(),session_helper::session_id());
     if($fcode == false) return;
 
     $common_id  = $fcode['common_id'];

mobile/control/cart.php

@@ -177,7 +177,7 @@ class cartControl extends mobileControl
     public function exgoodsOp()
     {
         $mod_fcode = Model('goods_fcode');
-        $mobile = session_helper::cur_mobile();
+        $mobile = session_helper::mobile();
         if(empty($mobile))
         {
             return self::outsuccess(array('special_list' => null,
@@ -189,7 +189,7 @@ class cartControl extends mobileControl
                 'mobile_page' => mobile_page(0)));
         }
 
-        $items = $mod_fcode->getFcodeList(['mobile' => session_helper::cur_mobile(), 'usable_time' => array('gt',time()),'fc_state' => 0],
+        $items = $mod_fcode->getFcodeList(['mobile' => session_helper::mobile(), 'usable_time' => array('gt',time()),'fc_state' => 0],
                                           '*','fc_state asc,fc_id asc',$this->page_size());
         $page_count = $mod_fcode->gettotalpage();
 

mobile/control/fcode.php

@@ -25,7 +25,7 @@ class fcodeControl extends mobileControl
         $common_id = intval($_GET['common_id']);
         $batch_code = $_GET['batch_code'];
         $status = intval($_GET['status']);
-        $mobile = empty(session_helper::cur_mobile()) ? $_GET['mobile'] : session_helper::cur_mobile();
+        $mobile = empty(session_helper::mobile()) ? $_GET['mobile'] : session_helper::mobile();
 
         if(session_helper::need_wechat_author()) {
             $author = new thrid_author\wxauthor();
@@ -109,7 +109,7 @@ class fcodeControl extends mobileControl
             return self::outsuccess(['url' => $url]);
         }
 
-        $oper = new fcode\operator($common_id,$batch_code,session_helper::cur_mobile(),session_helper::session_id());
+        $oper = new fcode\operator($common_id,$batch_code,session_helper::mobile(),session_helper::session_id());
         $fcode = $oper->grabed();
 
         if($fcode == false)
@@ -163,7 +163,7 @@ class fcodeControl extends mobileControl
         }
         else
         {
-            login_helper::onBinded($mobile,$code,session_helper::relay_id());
+            login_helper::onBinded($mobile,session_helper::relay_id());
             $oper->bind($fcode);
             return self::outsuccess(null);
         }

mobile/control/inoherb.php

@@ -80,7 +80,7 @@ class inoherbControl extends mobileControl
 
                 if(session_helper::logined()) {
                     $data['member_id'] = session_helper::memberid();
-                    $data['mobile'] = session_helper::cur_mobile();
+                    $data['mobile'] = session_helper::mobile();
                 } else {
                     $data['member_id'] = 0;
                 }
@@ -241,7 +241,7 @@ class inoherbControl extends mobileControl
         if(is_array($ret)) {
             return self::outerr($ret['code'], $ret['msg']);
         } else {
-            login_helper::onBinded($mobile,$code,session_helper::relay_id());
+            login_helper::onBinded($mobile,session_helper::relay_id());
             $member_id = session_helper::memberid();
             $nickname = session_helper::nickname();
 

mobile/control/login.php

@@ -73,7 +73,7 @@ class loginControl extends mobileHomeControl
     {
         $result = [];
         $result['member_avatar'] = session_helper::avatar();
-        $result['member_mobile'] = session_helper::cur_mobile();
+        $result['member_mobile'] = session_helper::mobile();
         $result['member_nickname'] = session_helper::nickname();
         $result['member_sex'] = session_helper::sex();
 
@@ -206,7 +206,7 @@ class loginControl extends mobileHomeControl
         //一些平台测试账户，特殊处理
         if($this->is_special($mobile,$code))
         {
-            if(login_helper::onBinded($mobile,$code,0,false)) {
+            if(login_helper::onBinded($mobile,0)) {
                 return self::outsuccess($this->ret_value());
             }
         }
@@ -314,7 +314,7 @@ class loginControl extends mobileHomeControl
 
         if($this->is_special($mobile,$code))
         {
-            if(login_helper::onBinded($mobile,$code,0,false)) {
+            if(login_helper::onBinded($mobile,0)) {
                 return self::outsuccess($this->ret_value());
             }
         }
@@ -334,7 +334,7 @@ class loginControl extends mobileHomeControl
             return self::outerr($ret['code'], $ret['msg']);
         }
 
-        if(login_helper::onBinded($mobile,$code,session_helper::relay_id(),false)) {
+        if(login_helper::onBinded($mobile,session_helper::relay_id())) {
             return self::outsuccess($this->ret_value());
         } else {
             return self::outerr(errcode::ErrDB,"对不起，系统出现错误:(");

mobile/control/member_buy.php

@@ -160,7 +160,7 @@ class member_buyControl extends mbMemberControl
             }
             else
             {
-                $result = fcode\send_manager::instance()->fetch($amount,$pay_sn,session_helper::cur_mobile(),session_helper::session_id());
+                $result = fcode\send_manager::instance()->fetch($amount,$pay_sn,session_helper::mobile(),session_helper::session_id());
                 if($result != false)
                 {
                     $order_pay = Model('order_pay');

mobile/control/member_fcode.php

@@ -27,7 +27,7 @@ class member_fcodeControl extends mbMemberControl
     public function listOp()
     {
         $mod_fcode = Model('goods_fcode');
-        $items = $mod_fcode->getFcodeList(array('mobile' => session_helper::cur_mobile()),'*','fc_state asc,usable_time desc,fc_id asc',$this->page_size());
+        $items = $mod_fcode->getFcodeList(array('mobile' => session_helper::mobile()),'*','fc_state asc,usable_time desc,fc_id asc',$this->page_size());
         $page_count = $mod_fcode->gettotalpage();
 
         Log::record("pages={$page_count},pagesize={$this->page_size()},pageno={$this->page_no()} curpage={$_GET['curpage']}");
@@ -142,7 +142,7 @@ class member_fcodeControl extends mbMemberControl
                 return self::outerr(errcode::ErrParamter,"密钥不正确，可能输入错误或者已经被其他人占用.");
             }
 
-            $oper = new fcode\operator($fcode->commonid(),$fcode->batch_code(),session_helper::cur_mobile(),session_helper::session_id());
+            $oper = new fcode\operator($fcode->commonid(),$fcode->batch_code(),session_helper::mobile(),session_helper::session_id());
             $oper->change($fcode->params());
 
             $fcode = new user_session\fcode();