Merge branch 'master' of gitee.com:yiguanjia/php

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'].'&#phone#='.$params['phone'],$params['mobile']);
+                Service::factory('SendSMSService')->tpl_send_sms(2163500,'#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/modules/j/controllers/HouseKeepingController.php

@@ -134,11 +134,11 @@ class HouseKeepingController extends JBaseController
             $h->tech_mobile = $tech_mobile;
         }
         $success = $h->save();
-        if ($h->save() && intval($h->status) == 2) {//status_time
+        if ($success && 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(
+            CommonSMS::send('jinguo_order_retrieve', array(
                 'user_name' => $h->user_name,
                 'year' => date('Y',$h->status_time),
                 'month' => date('m',$h->status_time),
@@ -150,9 +150,10 @@ class HouseKeepingController extends JBaseController
                 'address' => $store->address,
                 'phone' => $store->mobile,
                 'mobile' => $h->mobile,
-            ));*/
+            ));
 
         }
+
         CommonFn::requestAjax($success, '修改成功', array());
 
     }