拨打电话按钮是否显示

application/index/service/UserLogService.php

@@ -380,11 +380,22 @@ class  UserLogService
      * @param $agent_id
      * @param $is_vip
      * @param $result_user_phone
-     * @param $result_agent_id
      * @return int
      */
+<<<<<<< HEAD
     public function isPhoneButtonShow($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id)
     {
+=======
+<<<<<<< Updated upstream
+    public function isPhoneButtonShow($user_id,$agent_id,$is_vip,$result_user_phone,$result_agent_id)
+    {
+        $user_service = new UserService();
+        $vip_services = new VipService();
+        $s_user_agent = new UserAgentService();
+=======
+    public function isPhoneButtonShow($user_id, $agent_id, $is_vip, $result_user_phone)
+    {
+>>>>>>> 拨打电话按钮是否显示
         #当天有约带看的客户 0:不显示 1：显示
         $s_user_call    = new UserCallStintService();
         $is_user_report = $s_user_call->isUserReport($user_id);
@@ -396,10 +407,10 @@ class  UserLogService
         $user_service    = new UserService();
         $is_outstrip_twenty_four_hours = $user_service->isUserProtect($user_id);
         if (($is_outstrip_twenty_four_hours == 1) && ($is_user_report &&  (time() < $behind_see_time &&(time() > $front_see_time)))) {
-            $res = $this->isPhoneButtonShowA($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id);
+            $res = $this->isPhoneButtonShowA($user_id, $agent_id);
         }else{
             //无约带看 走老逻辑
-            $res = $this->isPhoneButtonShowB($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id);
+            $res = $this->isPhoneButtonShowB($user_id, $agent_id, $is_vip, $result_user_phone);
         }
         return $res;
     }
@@ -408,18 +419,17 @@ class  UserLogService
      * 拨打电话按钮 是否显示 2
      * @param $user_id
      * @param $agent_id
-     * @param $is_vip
-     * @param $result_user_phone
-     * @param $result_agent_id
      * @return int
      */
-    public function isPhoneButtonShowA($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id)
+    public function isPhoneButtonShowA($user_id, $agent_id)
     {
         #当天有约带看的客户 0:不显示 1：显示
         $s_user_call   = new UserCallStintService();
         $report_agents = $s_user_call->getUserReportAgentIdList($user_id);
+
+        $is_user_agent = $this->isUserAgent($agent_id,$user_id);
         //3.3.9 有约带看订单的客户 预计到场当天 只能 约带看提交人 或 客方 拨打电话
-        if (($result_agent_id == $agent_id) or (in_array($agent_id, $report_agents))) {
+        if (($is_user_agent == 1) or (in_array($agent_id, $report_agents))) {
             return 0;
         } else {
             return 1;
@@ -435,7 +445,7 @@ class  UserLogService
      * @param $result_agent_id
      * @return int
      */
-    public function isPhoneButtonShowB($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id)
+    public function isPhoneButtonShowB($user_id, $agent_id, $is_vip, $result_user_phone)
     {
         $user_service    = new UserService();
         $vip_services    = new VipService();
@@ -444,6 +454,10 @@ class  UserLogService
         //客户客方 所有城市
         $is_user_agent_boss = $called = 1;
         $user_agent_list_arr = [];
+<<<<<<< HEAD
+=======
+>>>>>>> Stashed changes
+>>>>>>> 拨打电话按钮是否显示
         $user_agent_list = $s_user_agent->getUserAgentId($user_id);
         if ($user_agent_list) {
             foreach ($user_agent_list as $key => $value) {