1

www/protected/components/CommonSMS.php

@@ -32,7 +32,7 @@ class CommonSMS{
                 Service::factory('SendSMSService')->tpl_send_sms(2163484,'#code#='.$params['code'],$params['mobile']);
                 break;
             case 'jinguo_order_retrieve'://订单退款后发送短信
-                Service::factory('SendSMSService')->tpl_send_sms(1594478,'#user_name#'.$params['user_name'].'&#year#'.$params['year'].'&#month#='.$params['month'].'&#day#='.$params['day'].'&#hour#'.$params['hour'].'&#minute#'.$params['minute'].'&#Interviewt#'.$params['Interviewt'].'&#store#'.$params['store'].'&#address#='.$params['address'].'&#mobile#='.$params['mobile'],$params['mobile']);
+                Service::factory('SendSMSService')->tpl_send_sms(1594478,'#user_name#'.$params['user_name'].'&#year#'.$params['year'].'&#month#='.$params['month'].'&#day#='.$params['day'].'&#hour#'.$params['hour'].'&#minute#'.$params['minute'].'&#Interviewt#'.$params['Interviewt'].'&#store#'.$params['store'].'&#address#='.$params['address'].'&#phone#='.$params['phone'],$params['mobile']);
                 break;
             default:
                 return false;

www/protected/controllers/RUserController.php

@@ -31,7 +31,10 @@ class RUserController extends AdminController{
             $criteria->_id('==', $user_id);
         }
 
-        if ($search != '' && !CommonFn::isMongoId($search) && !CommonFn::isDeviceId($search)){
+        if ($search != '' && !CommonFn::isMongoId($search)){
+            $criteria->source('or', new MongoRegex('/' . $search . '/'));
+            $criteria->addCond('user_info.mobile','or', new MongoRegex('/' . $search . '/'));
+            $criteria->addCond('user_info.user_name','or', new MongoRegex('/' . $search . '/'));
             $criteria->user_name('or', new MongoRegex('/' . $search . '/'));
             if (CommonFn::isMongoId($search)){
                 $criteria->_id('or', new MongoId($search));

www/protected/models/data/RUser.php

@@ -22,6 +22,7 @@ class RUser extends MongoAr
     public $shop_address = array(); //用户收货地址列表
     public $balance = 0;//账户余额
     public $user_info = array();
+    public $source = '壹管家';
 
 
     public function __construct($scenario='insert'){
@@ -73,6 +74,7 @@ class RUser extends MongoAr
                 $newRow['avatar'] = Yii::app()->params['defaultUserAvatar'];
             }
             $newRow['order_count'] = CommonFn::get_val_if_isset($row, 'order_count', 0);
+            $newRow['source'] = CommonFn::get_val_if_isset($row, 'source', '');
             $newRow['balance'] = CommonFn::get_val_if_isset($row, 'balance', 0);
             $newRow['openid'] = CommonFn::get_val_if_isset($row,'openid','');
             $newRow['wx_pub_openid'] = CommonFn::get_val_if_isset($row,'wx_pub_openid','');

www/protected/modules/j/controllers/HouseKeepingController.php

@@ -134,6 +134,25 @@ class HouseKeepingController extends JBaseController
             $h->tech_mobile = $tech_mobile;
         }
         $success = $h->save();
+        if ($h->save() && intval($h->status) == 2) {//status_time
+            $c = new EMongoCriteria();
+            $c->store_id('==',$h->store_id);
+            $store = Store::model()->find($c);
+            /*CommonSMS::send('jinguo_order_retrieve', array(
+                'user_name' => $h->user_name,
+                'year' => date('Y',$h->status_time),
+                'month' => date('m',$h->status_time),
+                'day' => date('d',$h->status_time),
+                'hour' => date('H',$h->status_time),
+                'minute' => date('i',$h->status_time),
+                'Interviewt' => '面试',
+                'store' => $store->store_name,
+                'address' => $store->address,
+                'phone' => $store->mobile,
+                'mobile' => $h->mobile,
+            ));*/
+
+        }
         CommonFn::requestAjax($success, '修改成功', array());
 
     }

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

@@ -27,7 +27,8 @@ class WebController extends JBaseController {
 						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid)){
 							$user->wx_pub_openid = $accessInfo['openid'];
 							$user->wx_have_follow = 1;
-							$user->update(array('wx_pub_openid','wx_have_follow'),true);
+                            $user->source = '巾帼家政';
+							$user->update(array('source','wx_pub_openid','wx_have_follow'),true);
 						}
 					}else{
 						$userAr  = new RUser();
@@ -39,6 +40,7 @@ class WebController extends JBaseController {
 						$userAr->register_time = time();
 						$userAr->channel = 'wxpub';
 						$userAr->wx_have_follow = 1;
+						$userAr->source = '巾帼家政';
 						$u_criteria = new EMongoCriteria();
 						$u_criteria->user_name('==',$userInfo['nickname']);
 						$olduser = RUser::model()->find($u_criteria);

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

@@ -28,8 +28,8 @@ class WebController extends MoonClubBaseController {
                         if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid)){
                             $user->wx_pub_openid = $accessInfo['openid'];
                             $user->wx_have_follow = 1;
-                            $user->update(array('wx_pub_openid','wx_have_follow'),true);
-
+                            $user->source = '享月会';
+                            $user->update(array('source','wx_pub_openid','wx_have_follow'),true);
                         }
                     }else{
                         $userAr  = new RUser();
@@ -41,6 +41,7 @@ class WebController extends MoonClubBaseController {
                         $userAr->channel = 'wxpub';
                         $userAr->wx_have_follow = 1;
                         $userAr->unionid = 'xiangyuhui';
+                        $userAr->source = '享月会';
                         $u_criteria = new EMongoCriteria();
                         $u_criteria->user_name('==',$userInfo['nickname']);
                        /* $olduser = RUser::model()->find($u_criteria);

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

@@ -27,7 +27,8 @@ class WebController extends O2oBaseController {
 						if(!isset($user->wx_pub_openid) || empty($user->wx_pub_openid)){
 							$user->wx_pub_openid = $accessInfo['openid'];
 							$user->wx_have_follow = 1;
-							$user->update(array('wx_pub_openid','wx_have_follow'),true);
+                            $user->source = '壹管家';
+							$user->update(array('source','wx_pub_openid','wx_have_follow'),true);
 						}
 					}else{
 						$userAr  = new RUser();
@@ -38,6 +39,7 @@ class WebController extends O2oBaseController {
 						$userAr->sex = $userInfo['sex'];
 						$userAr->register_time = time();
 						$userAr->channel = 'wxpub';
+						$userAr->source = '壹管家';
 						$userAr->wx_have_follow = 1;
 						$u_criteria = new EMongoCriteria();
 						$u_criteria->user_name('==',$userInfo['nickname']);

www/protected/views/rUser/index.php

@@ -510,6 +510,7 @@ $(function(){
                 }
             },
             {field:'balance', title:'余额', width:45,sortable:true},
+            {field:'source', title:'来源', width:45,sortable:true},
             {field:'order_count', title:'总单数', width:45,sortable:true},
             {field:'city_info', title:'城市', width:50, sortable: false,
                 formatter: function(value, row){