Merge branch 'test'

www/protected/models/data/RUser.php

@@ -24,6 +24,7 @@ class RUser extends MongoAr
     public $user_info = array();
     public $source = '壹管家';
     public $type = '微信';
+    public $isReg= false;
 
 
     public function __construct($scenario='insert'){
@@ -71,6 +72,7 @@ class RUser extends MongoAr
             $newRow['id'] = (string)$row['_id'];
             $newRow['sex'] = CommonFn::get_val_if_isset($row,'sex',3);
             $newRow['type'] = CommonFn::get_val_if_isset($row,'type','');
+            $newRow['isReg'] = CommonFn::get_val_if_isset($row,'isReg','');
             $newRow['avatar'] = CommonFn::get_val_if_isset($row,'avatar',Yii::app()->params['defaultUserAvatar']);
             if($newRow['avatar']==''){
                 $newRow['avatar'] = Yii::app()->params['defaultUserAvatar'];

www/protected/modules/construction/controllers/DefaultController.php

@@ -41,6 +41,7 @@ class DefaultController extends ConstructionController
             'sex' => (int)$user->sex,
         ];
         $user->balance = 800;
+        $user->isReg = true;// 是否注册信息
         $user->source = '建工';
         $user->type = '微信';
         $user->save();

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

@@ -25,11 +25,10 @@ class WebController extends ConstructionController {
 					$user = RUser::model()->find($criteria);
 					if ($user) {
 						$userId = $user->_id;
-						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid) || $user->source != "建工"){
+						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid)){
 							$user->wx_pub_openid = $accessInfo['openid'];
 							$user->wx_have_follow = 1;
-                            $user->source = '建工';
-							$user->update(array('source','wx_pub_openid','wx_have_follow'),true);
+							$user->update(array('wx_pub_openid','wx_have_follow'),true);
 						}
 					}else{
 						$userAr  = new RUser();