user_id

application/api_broker/controller/AppointmentShop.php

@@ -155,7 +155,7 @@ class AppointmentShop extends Basic
             $m_order = new OrderModel();
             $order_id = $m_order->getFieldValue('id', ['f_id'=>$is_ok]);
             $push = new PushMessageService();
-            $push->pushReportMessage($appoint_data["house_id"], $agent_id, 1, $this->agentId);
+            $push->pushReportMessage($appoint_data["house_id"], $agent_id, 1, $this->agentId, $appoint_data['user_id']);
             return $this->response("200", $data['msg'], ['user_id'=>$appoint_data["user_id"], 'order_id'=>$order_id]);
         } else {
             $appoint_watch->rollback(); //回滚事务

application/api_broker/controller/Report.php

@@ -88,7 +88,7 @@ class Report extends Basic
 
             if (is_array($house_ids_arr)) {
                 foreach ($house_ids_arr as $k=>$v) {
-                    $push->pushReportMessage($v, $agent_id, 1, $this->agentId);   //推送报备信息
+                    $push->pushReportMessage($v, $agent_id, 1, $this->agentId, $user_id);   //推送报备信息
                 }
             }
             /*记录推送*/

application/api_broker/service/PushMessageService.php

@@ -40,7 +40,7 @@ class PushMessageService
      * @param $operation_id
      * @return bool
      */
-    public function pushReportMessage($house_id, $agent_id, $type, $operation_id)
+    public function pushReportMessage($house_id, $agent_id, $type, $operation_id, $user_id)
     {
         try {
             $agent_id_arr = [];
@@ -57,6 +57,7 @@ class PushMessageService
             $save['message'] = $content;
             $save['order_id'] = $order_id['id'];
             $save['house_id'] = $house_id;
+            $save['user_id'] = $user_id;
             foreach ($data as $k => $v) {
 //            $this->pushAgentAllDeviceId($v['id'], '报备', $content);
                 $agent_id_arr[] = $v['id'];

application/index/controller/WatchShop.php

@@ -157,7 +157,7 @@ class WatchShop extends Basic
             $appoint_watch->commit();  //提交事务
 
             $push = new PushMessageService();
-            $push->pushReportMessage($appoint_data["house_id"], $agent_id, 1, $this->userId);
+            $push->pushReportMessage($appoint_data["house_id"], $agent_id, 1, $this->userId, $user_id);
             return $this->response("200", $data['msg']);
         } else {
             $appoint_watch->rollback(); //回滚事务