Merge branch 'test'

application/api_broker/controller/Broker.php

@@ -340,13 +340,6 @@ class Broker extends Basic
         $user_status = $params['user_status'];
 
         $Users  = new Users();
-        $result = $Users->getUserCityInfo($user_id);
-        if ($result) {
-            $params['province'] = $result[0]['province'] ? $result[0]['province'] : '上海市';
-            $params['city']     = $result[0]['city'] ? $result[0]['city'] : '上海市';
-            $params['disc']     = $result[0]['disc'] ? $result[0]['disc'] : '黄浦区';
-        }
-
         $UPhoneFollowPp = new UPhoneFollowPp($this->siteId);
         $result         = $UPhoneFollowPp->savePhoneFollow($params);
 

application/api_broker/service/CallPhoneService.php

@@ -548,12 +548,10 @@ class CallPhoneService
                     $array = explode('-', $v);
                     $follow_where['agent_id'] = $array[0];
                     $follow_where['user_id'] = $array[1];
-                    if(isset($array[2])){
-                        $site_id = $array[2];
-                    }else{
-                        $site_id = '10001';
-                    }
-                    $m_follow_up = new UPhoneFollowPp($site_id);
+                    if(empty($array[2])){
+                        $this->redis->hDel($user_key, $v);
+                    } else {
+                        $m_follow_up = new UPhoneFollowPp($array[2]);
                         $num = $m_follow_up->getFollowTotal($follow_where);
                         if (empty($num) && !empty($array[1])) {
                             //$agent_id, $user_id, $content, $type
@@ -563,6 +561,7 @@ class CallPhoneService
                     }
                 }
             }
+        }
         return;
     }
 

application/model/UPhoneFollowPp.php

@@ -297,21 +297,6 @@ class UPhoneFollowPp extends BaseModel
         $data['agent_id'] = $agent_id;
         $data['user_id']  = $user_id;
         $data['content']  = $content;
-
-        if ($user_id > 0) {
-            try {
-                $m_user = new Users();
-                $user_data = $m_user->selectUser($user_id, 'province,city,disc');
-                $data['province'] = $user_data['province'];
-                $data['city']     = $user_data['city'];
-                $data['disc']     = $user_data['disc'];
-            } catch (\Exception $e) {
-                $data['province'] = "";
-                $data['city']     = "";
-                $data['disc']     = "";
-            }
-        }
-
         $data['type']  = $type;
         return $this->UPhoneFollowPp->insertGetId($data);
     }