init

www/protected/modules/o2o/controllers/UserController.php

@@ -11,41 +11,13 @@ class  UserController extends O2oBaseController{
         $user_id = Yii::app()->getRequest()->getParam("user_id");
         // 触宝电话用户处理
         $from = Yii::app()->request->getParam('from', '');
-        if ($from == 'chubao') {
-            $accessToken = Yii::app()->request->getParam('accessToken', '');
-            $chubao = new Chubao();
-            $client = $chubao->getClient();
-            $account = $chubao->getAccountUser($accessToken);
-            $response = $client->execute($account);
-            $phone = str_replace('+86', '', $response['phone']);
-            $userId = $response['userId'];
-            // 触宝用户用户名为cb+手机号
-            $user_name = 'cb'.$phone;
-            $password = md5($userId);
-            $criteria = new EMongoCriteria();
-            $criteria->user_name('==', $user_name);
-            $criteria->password('==', $password);
-            $criteria->name('==', $userId);
-            $cb_user = RUser::model()->find($criteria);
-            if (!$cb_user) {
-                $cb_user = new RUser();
-                $cb_user->name = $userId;
-                $cb_user->user_name = $user_name;
-                $cb_user->password = $password;
-                $cb_user->save();
-            }
 
-            $user_id = (string)$cb_user->_id;
-        }
 
         if(CommonFn::isMongoId($user_id)){
             $user = Service::factory('UserService')->getUser(new MongoId($user_id),false);
             if($user){
                 $user = $user->parseRow($user->attributes);
-                // 触宝相关信息
-                if ($from == 'chubao') {
-                    $user['userId'] = $userId;
-                }
+
                 CommonFn::requestAjax(true,CommonFn::getMessage('message','operation_success'),$user);
             }else{
                 CommonFn::requestAjax(false,CommonFn::getMessage('user','id_not_exist'));
@@ -60,7 +32,8 @@ class  UserController extends O2oBaseController{
     public function actionExchangeCoupon(){
         $user_id = Yii::app()->getRequest()->getParam("user_id","");
         $exchange_code = intval(Yii::app()->getRequest()->getParam("exchange_code",0));
-        $device_id = Yii::app()->request->getParam('device_id');
+        //$device_id = Yii::app()->request->getParam('device_id');
+        $device_id = '';
         if(CommonFn::isMongoId($user_id) && $exchange_code){
             $user = CommonFn::apigetObJ($user_id,"ZUser",CommonFn::getMessage('user','id_not_exist'),201);
             $criteria = new EMongoCriteria();
@@ -72,9 +45,9 @@ class  UserController extends O2oBaseController{
 
                 $criteria = new EMongoCriteria();
                 if($device_id){
-                    $criteria->user('or',$user->_id);
-                    $criteria->user_device_id('or',$device_id);
-                    $criteria->channel('==',$exchange_code->channel);
+                   // $criteria->user('or',$user->_id);
+                    //$criteria->user_device_id('or',$device_id);
+                    //$criteria->channel('==',$exchange_code->channel);
                 }else{
                     $criteria->channel('==',$exchange_code->channel);
                     $criteria->user('==',$user->_id);
@@ -89,9 +62,9 @@ class  UserController extends O2oBaseController{
                 }
                 $exchange_code->use_time = $current_time;
                 $exchange_code->user = $user->_id;
-                $exchange_code->user_device_id = $device_id;
+                //$exchange_code->user_device_id = $device_id;
                 $exchange_code->status = 1;
-                $exchange_code->update(array('use_time','user_device_id','status','user'),true);
+                $exchange_code->update(array('use_time','status','user'),true);
                 CommonFn::requestAjax(true,CommonFn::getMessage('o2o','exchange_succeed'));
             }elseif($exchange_code && $exchange_code->status == 1){
                 CommonFn::requestAjax(false,CommonFn::getMessage('o2o','exchange_code_used'));

www/protected/modules/o2o/controllers/WebController.php

@@ -110,80 +110,4 @@ class WebController extends O2oBaseController {
         ));
     }
 
-    public function actionBaiduLogin(){
-        require_once(APP_PATH.'/protected/vendors/baiduSDK/BaiduApiClient.php');
-        require_once(APP_PATH.'/protected/vendors/baiduSDK/BaiduOAuth2.php');
-        require_once(APP_PATH.'/protected/vendors/baiduSDK/BaiduUtils.php');
-        //回调页地址
-        if(!isset($_GET['code'])){
-            $this->renderpartial('index',array('from_channel' => 'baidu'));
-        }else{
-            $code = $_GET['code'];
-            $oauth = new BaiduOAuth2(Yii::app()->params['baiduAK'], Yii::app()->params['baiduSK']);
-            $oauth->setRedirectUri('http://apitest.wozhua.mobi/index.php?r=o2o/web/baiduLogin');
-            $tokenArr = $oauth->getAccessTokenByAuthorizationCode($code);
-            if (is_array($tokenArr)) {
-                // 换取token成功
-                $accessToken = $tokenArr['access_token'];
-                $expires_in = $tokenArr['expires_in'];
-                // 获取用户信息
-                $client = new BaiduApiClient(Yii::app()->params['baiduAK'], $accessToken);
-                $infoArr = $client->api('/rest/2.0/passport/users/getInfo', array('fields' => 'userid,username,portrait'));
-                if (is_array($infoArr)) {
-                    // 获取用户信息成功
-                    // 在这里将百度账号与应用自身的账号系统做联合登录处理
-                    // setcookie('bd_access_token', $accessToken, strtotime('2030-1-1 12:00:00'), '/');
-                    // setcookie('bd_username', $infoArr['username'], strtotime('2030-1-1 12:00:00'), '/');
-                    // setcookie('bd_uid', $infoArr['userid'], strtotime('2030-1-1 12:00:00'), '/');
-                    // setcookie('bd_portrait', $infoArr['portrait'], strtotime('2030-1-1 12:00:00'), '/');
-                    //检查是否有注册，没有就注册
-                    $criteria = new EMongoCriteria();
-                    $criteria->openid('==', $infoArr['userid']);
-                    $user = RUser::model()->find($criteria);
-                    if ($user) {
-                        $userId = (string)$user->_id;
-                    }else{
-
-                        $userAr  = new RUser();
-                        $userAr->user_name = $infoArr['username'];
-                        $userAr->register_time = time();
-                        $userAr->app_client_id = 3;
-                        $userAr->channel = 'baidu';
-                        $userAr->openid = $infoArr['userid'];
-                        $userAr->last_visit_time = time();
-                        $u_criteria = new EMongoCriteria();
-                        $u_criteria->user_name('==',$infoArr['username']);
-                        $olduser = RUser::model()->find($u_criteria);
-                        if($olduser){
-                            $user_new_neme = $userAr->user_name.'_'.substr(time(),-7);
-                            $userAr->user_name = $user_new_neme;
-                        }
-                        //用户注册后默认关注几个圈子
-                        $z_group = new ZGroup();
-                        $userAr->groups = $z_group->get_default_fllow_group();
-                        if($userAr->save()){
-                            if(!empty($userAr->groups)){
-                                foreach ($userAr->groups as $group_id) {
-                                    $z_group = new ZGroup();
-                                    $group_obj = $z_group->get($group_id);
-                                    if($group_obj){
-                                        $group_obj->users_count = $group_obj->users_count+1;
-                                        $group_obj->update(array('users_count'),true);
-                                    }
-                                }
-                            }
-                            $userId = (string)$userAr->_id;
-                        }
-                    }
-                }
-                $this->renderpartial('index', array(
-                    'version' => '2015111601',
-                    'debug' => 'false',
-                    'userId' => $userId,
-                    'from_channel' => 'baidu'
-                ));
-            }
-        }
-
-    }
 }