1

application/index/service/UserCallStintService.php

@@ -34,12 +34,12 @@ class UserCallStintService
      * @return int
      */
     public function isUserReport($user_id){
-        $is_report = 0;
+        $is_report = [];
         $band_user_list = $this->getUserBindList($user_id);
         foreach ($band_user_list as $v) {
             $res = $this->findReport($v);
             if($res){
-                $is_report =  1;
+                $is_report =  $res;
                 break;
             }
         }
@@ -117,7 +117,7 @@ class UserCallStintService
     /**
      * 客户今天是否有约带看
      * @param $user_id
-     * @return bool
+     * @return array|false|\PDOStatement|string|\think\Collection
      */
     public function findReport($user_id){
         $begin_date = date("Y-m-d 00:00:00");
@@ -126,12 +126,12 @@ class UserCallStintService
         // $conditions['report_agent_id'] = $agent_id;
         $conditions['user_id'] = $user_id;
         $conditions['predict_see_time'] = array( 'between', array( $begin_date, $end_date));
-        $report = $this->m_report->selectReportByIdTime('id',$conditions);
+        $report = $this->m_report->selectReportByIdTime('id,predict_see_time',$conditions);
 
         if (count($report) > 0) {
-            return true;//有约带看
+            return $report;//有约带看
         }else{
-            return false;//无约带看
+            return [];//无约带看
         }
 
     }

application/index/service/UserLogService.php

@@ -133,7 +133,7 @@ class  UserLogService
         #有约带看的客户显示 '约带看'标签 0:不显示 1：显示
         $s_user_call              = new UserCallStintService();
         $is_user_report           = $s_user_call->isUserReport($user_id);
-        $data['is_user_report'] = $is_user_report;
+        $data['is_user_report'] = $is_user_report ? 1 : 0;
         return ["code" => 200, "data" => $data];
     }
 
@@ -280,7 +280,8 @@ class  UserLogService
         #有约带看的客户显示 '约带看'标签 0:不显示 1：显示
         $s_user_call              = new UserCallStintService();
         $is_user_report           = $s_user_call->isUserReport($user_id);
-        $result['is_user_report'] = $is_user_report;
+        $result['is_user_report'] = $is_user_report ? 1 : 0;
+
 
         #拨打电话按钮是否显示  0:显示 1:不显示
         $result['is_phone_button_show'] = $this->isPhoneButtonShow($user_id, $agent_id, $result['vip'], $result['user_phone'], $result['agent_id']);
@@ -360,9 +361,10 @@ class  UserLogService
     {
         #当天有约带看的客户 0:不显示 1：显示
         $s_user_call    = new UserCallStintService();
-        $is_user_report = $s_user_call->isUserReport($user_id);
-        //3.3.9 如果有约带看 同时过保护期了
-        if ($is_user_report == 1 ) {
+        $is_user_report = $s_user_call->isUserReport($user_id); date("Y-m-d H:i:s", strtotime("-1 hour"));
+        //3.3.9 如果有约带看 同时在约带看时间后2小时之前的
+        $predict_see_time = strtotime ("+2 hour", strtotime($is_user_report[0]['predict_see_time']));
+        if ($is_user_report &&  (time() < $predict_see_time)) {
             big_log('有约带看');
             $res = $this->isPhoneButtonShowA($user_id, $agent_id, $is_vip, $result_user_phone, $result_agent_id);
         }else{