Merge branch 'test'

application/api_broker/validate/BrokerValidate.php

@@ -18,15 +18,17 @@ class BrokerValidate extends Validate{
     ];
 
     protected $message = [
-        'type.require'        => 'type为必填字段',
-        'type.number'         => 'type只能为数字',
-        'agent_id.require'    => 'agent_id为必填字段',
-        'agent_id.number'     => 'agent_id只能为数字',
-        'labels_id.number'    => 'labels_id只能为数字',
-        'user_id.require'     => 'user_id为必填字段',
-        'user_id.number'      => 'user_id只能为数字',
-        'user_status.require' => 'user_status为必填字段',
-        'user_status.number'  => 'user_status只能为数字'
+        'type.require'        => '网络异常，请再次提交！错误代码：bv1',//type为必填字段
+        'type.in'             => '网络异常，请再次提交！错误代码：bv2',//type只能0,1,2中间
+        'agent_id.require'    => '网络异常，请再次提交！错误代码：bv3',//agent_id为必填字段
+        'agent_id.number'     => '网络异常，请再次提交！错误代码：bv4',//agent_id只能为数字
+        'agent_id.gt'         => '网络异常，请再次提交！错误代码：bv10',//agent_id必须大于0
+        'labels_id.number'    => '网络异常，请再次提交！错误代码：bv5',//labels_id只能为数字
+        'user_id.require'     => '网络异常，请再次提交！错误代码：bv6',//user_id为必填字段
+        'user_id.number'      => '网络异常，请再次提交！错误代码：bv7',//user_id只能为数字
+        'user_id.gt'          => '网络异常，请再次提交！错误代码：bv11',//user_id必须大于0
+        'user_status.require' => '网络异常，请再次提交！错误代码：bv8',//user_status为必填字段
+        'user_status.number'  => '网络异常，请再次提交！错误代码：bv9'//user_status只能为数字
 
     ];
 

application/index/controller/Member.php

 <?php
 
 namespace app\index\controller;
+use app\api_broker\service\ClientService;
 use app\index\extend\Basic;
 use app\model\AAgents;
 use app\model\GOperatingRecords;
@@ -90,16 +91,13 @@ class Member extends Basic{
             //创建开始时间
             if (!empty($params['start_date']) && empty($params['end_date'])) {
                 $where['a.create_time'] = ['> time', $params['start_date'] . '00:00:00'];
-            }
-
-            //创建结束时间
-            if (!empty($params['end_date']) && empty($params['start_date'])) {
+            }elseif (!empty($params['end_date']) && empty($params['start_date'])) {
                 $where['a.create_time'] = ['< time', $params['end_date'] . '23:59:59'];
-            }
-
-            //创建开始时间
-            if (!empty($params['start_date']) && !empty($params['end_date'])) {
+            }elseif (!empty($params['start_date']) && !empty($params['end_date'])) {
                 $where['a.create_time'] = ['between time', [$params['start_date']. ' 00:00:00', $params['end_date'] . ' 23:59:59']];
+            }else{
+                $time_                     = date('Y-m-d H:i:s', strtotime("-1 day"));
+                $where['a.create_time'] = array( 'lt', $time_ );
             }
 
             //跟进结束时间
@@ -261,13 +259,19 @@ class Member extends Basic{
             a.user_name,a.status,a.first_login_time,a.last_login_time,a.agent_id,a.vip,a.price_demand,a.industry_type,a.area_demand,a.user_status,a.source';
 
             try {
-                $data['list'] = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);
-
-                foreach ($data['list'] as $k=>$v) {
-                    $data['list'][$k]['user_phone'] = hide_customer_phone($data['list'][$k]['user_phone']);
-                    $data['list'][$k]['current_agent_id'] = $this->userId;
+                $data_list = $this->user->getUserAgent($pageNo, $pageSize, 'a.id DESC', $fields, $where, $type);
+                $clientService = new ClientService();
+                $list          = [];
+                foreach ($data_list as $k=>$v) {
+                    $data_list[$k]['user_phone'] = hide_customer_phone($data_list[$k]['user_phone']);
+                    $data_list[$k]['current_agent_id'] = $this->userId;
+                    $is_show = $clientService->dialTotal($v["id"]);
+                    if ($is_show) {
+                        array_push($list, $data_list[$k]);
                     }
 
+                }
+                $data['list']  =$list;
                 $data['total'] = $this->user->getUserAgentTotal($where, $type);
             } catch (\Exception $e) {
                 return $this->response(101, '内部错误，获取客户失败！请联系运营。');