转为报备客户名字

application/index/controller/WatchShop.php

@@ -93,7 +93,7 @@ class WatchShop extends Basic
         $appoint_watch = new AppointWatchShop();
         $appoint_watch->startTrans();   //开启事务
 
-        $fields = 'id,agents_id,house_title,house_id,expect_time,user_id,other_require';
+        $fields = 'id,agents_id,house_title,house_id,expect_time,user_id,other_require,appellation';
         $where['id']  = $this->params['watch_id'];
         $appoint_data = $appoint_watch->getAppointInfo($fields, $where);
 
@@ -117,9 +117,9 @@ class WatchShop extends Basic
 
         //todo 验证用户id是否正常
         $userArr = $service_->verifyUser($user_id);
-
+        $user_name = empty($userArr['user_name']) ? $appoint_data['appellation'] : $userArr["user_name"];
         $is_ok = $service_->verifyReport($agent_id, $agent_phone, $agent_data['name'], $store_id, $user_id,
-            $userArr["user_phone"], $userArr["user_name"], $house_id,$vehicle, $intro, $predict_see_time);
+            $userArr["user_phone"], $user_name, $house_id,$vehicle, $intro, $predict_see_time);
 
         if ($is_ok > 0) {
 
@@ -127,11 +127,11 @@ class WatchShop extends Basic
                 'applies_id' => $is_ok,'agents_id'=>$agent_id
             ],$appoint_data['id']);
 
-            $push = new PushMessageService();
-            $push->pushReportMessage($appoint_data["house_id"], $agent_id);
-
             $data['msg'] = '报备成功并通知经纪人';
             $appoint_watch->commit();  //提交事务
+
+            $push = new PushMessageService();
+            $push->pushReportMessage($appoint_data["house_id"], $agent_id);
             return $this->response("200", $data['msg']);
         } else {
             $appoint_watch->rollback(); //回滚事务