保护期修改

application/api_broker/controller/HomePageLog.php

@@ -8,6 +8,7 @@ use app\api_broker\service\RedisCacheService;
 use app\api_broker\service\UserExpiredTimeService;
 use app\api_broker\service\VerifyRepetitionService;
 use app\extra\RedisExt;
+use app\index\service\UserService;
 use app\model\AAgents;
 use app\model\GHouses;
 use app\model\GHousesFollowUp;
@@ -131,7 +132,10 @@ class HomePageLog extends Basic
 
         $clientService = new ClientService();
         $m_label       = new ULabels();
+        $user_service = new UserService();
+
         $label_data    = $m_label->getColumn('id,name', ['type' => 1]);  //获取标签
+
         foreach ($result as $key => $value) {
             $agent_params               = [];
             $agent_params["a.id"]       = $value['agent_id'];
@@ -145,9 +149,11 @@ class HomePageLog extends Basic
                 $result[$key]['create_time'] = date("Y-m-d H:i:s",$value["create_time"] / 1000);
 
             //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
-            $ser                                           = new UserExpiredTimeService();
-            $res                                           = $ser->getExpiredTimeByUser($value['user_id']);
-            $result[$key]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1;
+            // $ser                                           = new UserExpiredTimeService();
+            // $res                                           = $ser->getExpiredTimeByUser($value['user_id']);
+            // $result[$key]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1;
+            #保护期（0：保护器内 1：超过保护期）
+            $result[$key]['is_outstrip_twenty_four_hours'] = $user_service->isUserProtect($value['user_id']);
 
             $is_show                    = $clientService->dialTotal($value["user_id"]);
             $result[$key]['sign_call']  = $is_show ? 0 : 1;

application/index/service/UserLogService.php

@@ -171,8 +171,7 @@ class  UserLogService
         $data['examine_vip'] = $vip_services->vip($agent_id);
 
         //绑定关系(关联客户)
-        $s_index_user = new UserService();
-        $data['user_bind_list'] = $s_index_user->userBindInfo($user_id);
+        $data['user_bind_list'] = $user_service->userBindInfo($user_id);
 
         /**
          * 以下是新方法，上面的找时间替换掉