新增客方推送

application/api/controller/Member.php

@@ -2,8 +2,7 @@
 
 namespace app\api\controller;
 
-use app\api\untils\GeTuiUntils;
-use app\model\AAgents;
+use app\api_broker\service\PushMessageService;
 use think\Request;
 use app\api\extend\Basic;
 use app\api\untils\MessageUntils;
@@ -279,11 +278,11 @@ class Member extends Basic
                             }
                         }
 
-                        $ge_tui  = new GeTuiUntils();
-                        $agent_ = new AAgents();
-                        $agent_data = $agent_->getAgentInfo('device_id',$referrer_id);
+                        if (!empty($insert_data['agent_id'])) {
+                            $push = new PushMessageService();
                             $content = '你有新客户【'.$user_nick.'-'.$phone.'】成功注册App';
-                        $ge_tui->public_push_message_for_one($referrer_id,$agent_data['device_id'],'邀请注册',$content);
+                            $push->pushMessageById($insert_data['agent_id'],'邀请注册', $content);
+                        }
                     }
                 }
                 $insert_data['referrer_id']     = $referrer_id;   //经纪人邀请

application/api_broker/controller/Client.php

@@ -3,8 +3,8 @@
 namespace app\api_broker\controller;
 
 use app\api_broker\extend\Basic;
+use app\api_broker\service\PushMessageService;
 use app\model\AAgents;
-use app\model\Agents;
 use app\model\ULabels;
 use app\model\Users;
 use app\model\UPhoneFollowPp;
@@ -53,31 +53,29 @@ class Client extends Basic
                     if ($this->params['agents_id'] != $this->params['ccr_id']) {
                         $agent = new AAgents();
                         $agent_data = $agent->getAgentInfo('name,phone', $this->params['agents_id']);
-                        $remark = '修改客方为'.$agent_data['name'].'-'.$agent_data['phone'];
-                    } else {
-                        $remark = '用户编辑';
+                        $remark = '修改为'.$agent_data['name'].'-'.$agent_data['phone'];
+
+                        $push = new PushMessageService();
+                        $push->pushMessageById($this->params['ccr_id']);
+                        $this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']);
                     }
                     //编辑
                     $data['start'] = $this->user->edit($this->params, $this->params['id']);
-                    $this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$this->params['id']);
+
                 } else {
                     $table = new AAgents();
 
                     //添加
                     $data['start'] = $this->user->edit($this->params);
 
-                    if ($data['start'] != 1) {
-                        $this->code = 101;
-                        $this->msg  = '该用户已存在';
-                    } elseif ($data['start'] == 1){
-                        $data['id']= $this->user->id;
-                        $this->operating_records($this->params['ccr_id'], $type=3, $remark='用户添加',0,$data['id']);
-                    } else {
+                    if ($data['start'] == 1) {
                         $data['id']= $this->user->id;
-                        //获取客方数据
-                        $name   = $table->where('id',$this->params['agents_id'])->value('name');
-                        $remark = '客方添加为 '.$name;
+                        $agent_data = $table->getAgentInfo('name,phone',$this->params['agents_id']);
+                        $remark     = '新增为'. $agent_data['name'].'-'.$agent_data['phone'];
                         $this->operating_records($this->params['ccr_id'], $type=3, $remark,0,$data['id']);
+                    } else {
+                        $this->code = 101;
+                        $this->msg  = '该用户已存在';
                     }
                 }
             } else {

application/api_broker/service/PushMessageService.php

@@ -139,4 +139,25 @@ class PushMessageService
 
         return ;
     }
+
+    /**
+     * 普通消息推送
+     *
+     * @param $id
+     * @param $title
+     * @param $content
+     * @return array|void
+     */
+    public function pushMessageById($id, $title,$content) {
+
+        if (empty($id)) {
+            return false;
+        }
+
+        $ge_tui = new GeTuiUntils();
+        $agent = new AAgents();
+        $device_id = $agent->getAgentsById($id, 'device_id');
+        $result = $ge_tui->public_push_message_for_one($id, $device_id, $title, $content);
+        return $result;
+    }
 }
\ No newline at end of file

application/model/Users.php

@@ -222,12 +222,12 @@ class Users extends Model
      */
     public function getClient($id) {
         if ($id) {
-            $data = $this->field('a.id as user_id,a.user_nick,a.user_phone,a.sex,a.agent_id,a.create_time,b.realname,b.phone')
+            $data = $this->field('a.id as user_id,a.user_nick,a.user_phone,a.sex,a.agent_id,a.create_time,b.name,b.phone')
                 ->alias('a')
-                ->join('agents b','a.agent_id=b.id', 'left')
+                ->join('a_agents b','a.agent_id=b.id', 'left')
                 ->where('a.id',$id)->find();
-            $data['agents'] = $data['realname'].'-'.$data['phone'];
-            unset($data['realname']);
+            $data['agents'] = $data['name'].'-'.$data['phone'];
+            unset($data['name']);
             unset($data['phone']);
         } else {
             $data = false;