bug

application/api_broker/controller/Broker.php

@@ -18,6 +18,7 @@ use app\api_broker\service\CallPhoneService;
 use app\api_broker\service\ClientService;
 use app\api_broker\service\OrderLogService;
 use app\extra\RedisExt;
+use app\index\service\UserService;
 use app\model\AAgents;
 use app\model\ABindingDevice;
 use app\model\ACollectUser;
@@ -477,13 +478,9 @@ class Broker extends Basic
         /*是否被收藏 end*/
 
         /*判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期 start*/
-        //$ser = new UserExpiredTimeService();
-        //$res = $ser->getExpiredTimeByUser($v["user_id"]);
-        //$data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;
-        $is_outstrip_twenty_four_hours = 0;
-        if ((time() - strtotime($user_res['create_time'])) > (60 * 60 * 24)) {
-            $is_outstrip_twenty_four_hours = 1;
-        }
+        //查询客户是否在保护期内
+        $user_service = new UserService();
+        $is_outstrip_twenty_four_hours = $user_service->isUserProtect($params["user_id"]);
         $data['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
         /*判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期 end*/
 

application/index/controller/Remark.php

@@ -12,6 +12,7 @@ use app\api_broker\service\CallPhoneService;
 use app\api_broker\service\ClientService;
 use app\api_broker\service\UserExpiredTimeService;
 use app\index\extend\Basic;
+use app\index\service\UserService;
 use app\model\AAgents;
 use app\model\Agents;
 use app\model\GOperatingRecords;
@@ -120,15 +121,12 @@ class Remark extends Basic
 
         foreach ($data['data']['list'] as $k => $v) {
             //            dump($v);
-            //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
-            /*$ser = new UserExpiredTimeService();
-            $res = $ser->getExpiredTimeByUser($v["user_id"]);
-            $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/
 
-            $is_outstrip_twenty_four_hours = 0;
-            if ((time() - strtotime($v['u_create_time'])) > (60 * 60 * 24)) {
-                $is_outstrip_twenty_four_hours = 1;
-            }
+
+            //查询客户是否在保护期内
+            //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
+            $user_service = new UserService();
+            $is_outstrip_twenty_four_hours = $user_service->isUserProtect($v["user_id"]);
             $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
 
             /* 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定 start*/
@@ -238,22 +236,10 @@ class Remark extends Basic
         $res = $ser->getExpiredTimeByUser($v["user_id"]);
         $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/
 
-        $is_outstrip_twenty_four_hours = 0;
-        if ((time() - strtotime($user_res['u_create_time'])) > (60 * 60 * 24)) {
-            $is_outstrip_twenty_four_hours = 1;
-        }
-        $user_res['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
-
-
+        //查询客户是否在保护期内
         //判断客户是否超过24小时保护期间 0：保护器内 1：超过保护期
-        /*$ser = new UserExpiredTimeService();
-        $res = $ser->getExpiredTimeByUser($v["user_id"]);
-        $data['data']['list'][$k]['is_outstrip_twenty_four_hours'] = $res ? 0 : 1 ;*/
-
-        $is_outstrip_twenty_four_hours = 0;
-        if((time() - strtotime($user_res['u_create_time'])) > (60*60*24)){
-            $is_outstrip_twenty_four_hours = 1;
-        }
+        $user_service = new UserService();
+        $is_outstrip_twenty_four_hours = $user_service->isUserProtect($v["user_id"]);
         $user_res['is_outstrip_twenty_four_hours'] = $is_outstrip_twenty_four_hours;
 
         $records = new GOperatingRecords();