邀请人修改记录

application/index/service/UserService.php

@@ -179,13 +179,12 @@ class UserService
         try {
             $user_data = $this->user->getUserById('user_name,user_phone', $referrer_id);
 
-            $user_data['user_phone'] = empty($user_data['user_phone']) ? '' :substr_replace($user_data['user_phone'], '****', 3, 4);
+            $user_phone = empty($user_data['user_phone']) ? '' :substr_replace($user_data['user_phone'], '****', 3, 4);
             if ($type == 'add') {
-                $remark    = '新增为' . $user_data['user_name'] . '-' . $user_data['user_phone'] . '，客户ID：' . $referrer_id;
+                $remark    = '新增为' . $user_data['user_name'] . '-' . $user_phone . '，客户ID：' . $referrer_id;
             } else {
                 if ($referrer_id != $referrer_id_old) {
-                    $user_data   = $this->user->getUserById('user_name,user_phone', $referrer_id);
-                    $remark      = '编辑为' . $user_data['user_name'] . '-' . $user_data['user_phone'] . '，客户ID：' . $referrer_id;
+                    $remark      = '编辑为' . $user_data['user_name'] . '-' . $user_phone . '，客户ID：' . $referrer_id;
                 }
             }
 

application/model/MPushMessage.php

@@ -70,7 +70,7 @@ class MPushMessage
      * @param $data
      * @return bool
      */
-    public function addHouseIdArray(array $house_id, int $operation_id = 0, int $type, $data)
+    public function addHouseIdArray(array $house_id, int $type, $data)
     {
         if (!is_array($house_id)) {
             return false;
@@ -78,23 +78,29 @@ class MPushMessage
 
         $insert_data = [];
         foreach ($house_id as $k => $v) {
-            $insert_data[$k]['house_id'] = $v;
 
-            if (isset($data['message'])) {
-                $insert_data[$k]['message'] = $data['message'];
-            }
+            $agent_id = $this->selectAgentHouse($v);
 
-            if (isset($data['user_id'])) {
-                $insert_data[$k]['user_id'] = $data['user_id'];
-            }
+            foreach ($agent_id as $k2=>$v2) {
+                $insert_data[$k2]['house_id'] = $v;
+
+                if (isset($data['message'])) {
+                    $insert_data[$k2]['message'] = $data['message'];
+                }
+
+                if (isset($data['user_id'])) {
+                    $insert_data[$k2]['user_id'] = $data['user_id'];
+                }
 
-            if (isset($data['addressee_id'])) {
-                $insert_data[$k]['addressee_id'] = $data['addressee_id'];
+                if (isset($data['addressee_id'])) {
+                    $insert_data[$k2]['addressee_id'] = $data['addressee_id'];
+                }
+
+                $insert_data[$k2]['type']         = $type;
+                $insert_data[$k2]['status']       = 0;
+                $insert_data[$k2]['operation_id'] = $v2;
             }
 
-            $insert_data[$k]['type']         = $type;
-            $insert_data[$k]['status']       = 0;
-            $insert_data[$k]['operation_id'] = $operation_id;
         }
 
         $num = $this->db_->insertAll($insert_data);
@@ -153,6 +159,10 @@ class MPushMessage
         return $result;
     }
 
+    /**
+     * @param $house_id
+     * @return array
+     */
     public function selectAgentHouse($house_id) {
         $m_house = new GHousesToAgents();
         $where['a.house_id'] = $house_id;
@@ -160,7 +170,9 @@ class MPushMessage
 
         $data = [];
         if ($result['status'] != 'fail') {
-            $data = $result['data'];
+            foreach ($result['agents_id'] as $k=>$v) {
+                $data[] = $v;
+            }
         }
 
         return $data;

application/task/controller/UpdateShopStatusTask.php

@@ -141,7 +141,7 @@ class UpdateShopStatusTask
         $push_service->record(1, $this->house_id, 0, 0);
     }
 
-    public function __destruct() {
-        $this->recordPushMessage();
-    }
+//    public function __destruct() {
+//        $this->recordPushMessage();
+//    }
 }
\ No newline at end of file