bug

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;
@@ -134,16 +135,9 @@ class HomePageLog extends Basic
         $redis_service = new RedisCacheService();
 //        $label_data    = $m_label->getColumn('id,name', ['type' => 1]);  //获取标签
         $label_data = $redis_service->userCallLabelCache();
-        foreach ($result as $key => $value) {
-//            $agent_params               = [];
-//            $agent_params["a.id"]       = $value['agent_id'];
-//            $agent_field                = "a.name,a.img,b.store_name";
-//            $model                      = new AAgents();
-//            $res_a                      = $model->getAgentsInfo($agent_field, $agent_params);
-//            $result[$key]['name']       = $res_a[0]['name'];
-//            $result[$key]['img']        = $res_a[0]['img'];
-//            $result[$key]['store_name'] = $res_a[0]['store_name'];
+        $user_service = new UserService();
 
+        foreach ($result as $key => $value) {
             if ($value['agent_id']) {
                 $res_a = $redis_service->getRedisCache(2, $value['agent_id']);
                 $result[$key]['name']       = $res_a['name'];
@@ -159,9 +153,12 @@ 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

@@ -137,15 +137,9 @@ class  UserLogService
         }
         /*是否被收藏 end*/
 
-        /*判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期 start*/
-        //查询客户是否在保护期内
+        #保护期（0：保护器内 1：超过保护期）
         $user_service = new UserService();
-        $is_outstrip_twenty_four_hours = $user_service->isUserProtect($user_id);
-        $data['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
-        /*判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期 end*/
-
-
-
+        $data['is_outstrip_twenty_four_hours'] = $user_service->isUserProtect($user_id);
 
         // 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定
         //0允许拨打 1不允许拨打