other_id

application/api/controller/AppointmentTime.php

@@ -350,21 +350,16 @@ class AppointmentTime extends Basic
      */
     public function checkAppointment()
     {
-        $data['name'] = $msg = "";
+        $msg = "";
+        $data = [];
         try {
             $m_push = new OPushMessageModel();
             $where['user_id'] = $this->userId;
-//            $where['user_id'] = 3;
             $where['status'] = 0;
             $where['type']   = ['in', '0,3'];
             $field = 'id,operation_id,house_id,message,type,other_id';
             $id = $m_push->getListByWhere($field, $where, 1, 1);
-
             if (!empty($id[0]['id'])) {
-//                $data['is_alert'] = 0;
-//                $data['string_1'] = '';
-//                $data['string_2'] = '';
-//            } else {
                 $data['name'] = $id[0]['message'];
                 $data['is_alert'] = 1;
                 $data['type'] = $id[0]['type'];

application/api/service/PushClientService.php

@@ -31,6 +31,8 @@ class PushClientService
      * @param int $type
      * @param $message
      * @param int $operation_id
+     * @param int $addressee_id
+     * @param int $other_id
      * @return bool
      */
     public function record(int $report_id, int $order_id, int $type, $message,int $operation_id, $addressee_id = 0, $other_id = 0)

application/api_broker/controller/OrderLog.php

@@ -93,7 +93,7 @@ class OrderLog extends Basic
 
             //评价经纪人
             $push_client = new PushClientService();
-            $push_client->record((int)$params["report_id"], (int)$params["order_id"], 0, '', (int)$this->agentId, 0,$insert_id);
+            $push_client->record((int)$params["report_id"], (int)$params["order_id"], 0, '', (int)$this->agentId, 0, $insert_id);
 
             //经纬度
             if (!empty($params['longitude']) && !empty($params['latitude'])) {

application/model/OPushMessageModel.php

@@ -50,6 +50,10 @@ class OPushMessageModel extends BaseModel
             $insert_data['user_id'] = $data['user_id'];
         }
 
+        if (isset($data['other_id'])) {
+            $insert_data['other_id'] = $data['other_id'];
+        }
+
         $insert_data['status']       = 0;
         $insert_data['type']         = $type;
         $insert_data['operation_id'] = $operation_id;