Commit 2c686aa0 authored by zhuwei's avatar zhuwei

bug

parent dbd579a9
...@@ -496,8 +496,8 @@ class Broker extends Basic ...@@ -496,8 +496,8 @@ class Broker extends Basic
/*查询客户邀请人 end*/ /*查询客户邀请人 end*/
// 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定 // 判断当天被拨打是否超过5次,同时判断是否当前经纪人跟当前客户是否有电话绑定
//0允许拨打 1不允许拨打
$data['is_outpace_call_num'] = 0; $data['is_outpace_call_num'] = 0;
$clientService = new ClientService(); $clientService = new ClientService();
if (!$clientService->dialTotal($params["user_id"])) { if (!$clientService->dialTotal($params["user_id"])) {
...@@ -512,8 +512,6 @@ class Broker extends Basic ...@@ -512,8 +512,6 @@ class Broker extends Basic
} }
return $this->response("200", "success!", $data); return $this->response("200", "success!", $data);
} }
......
...@@ -681,6 +681,17 @@ class PerformanceService ...@@ -681,6 +681,17 @@ class PerformanceService
} }
return [ "code" => 200, "date" => $payLogList ]; return [ "code" => 200, "date" => $payLogList ];
} }
/**
* 进场
* @param $id
* @param $type
* @param $start_time
* @param $end_time
* @param $page_no
* @param $page_size
* @return array
*/
public function marchInListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size) public function marchInListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size)
{ {
...@@ -688,7 +699,7 @@ class PerformanceService ...@@ -688,7 +699,7 @@ class PerformanceService
//dump($params); //dump($params);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,c.user_name,c.user_phone,c.predict_see_time,c.report_agent_name,b.house_title,e.store_name"; $field = "a.id,c.user_name,c.user_phone,c.predict_see_time,c.report_agent_name,b.house_title,e.store_name,b.id as order_id";
$addMarchInList = $this->marchInModel->getAddMarchInListPcInfo($params, $field, $page_no, $page_size); $addMarchInList = $this->marchInModel->getAddMarchInListPcInfo($params, $field, $page_no, $page_size);
//获取图片信息 //获取图片信息
foreach ($addMarchInList as $key => $val) { foreach ($addMarchInList as $key => $val) {
...@@ -697,6 +708,8 @@ class PerformanceService ...@@ -697,6 +708,8 @@ class PerformanceService
return [ "code" => 200, "date" => $addMarchInList ]; return [ "code" => 200, "date" => $addMarchInList ];
} }
public function getUserResourceListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size) public function getUserResourceListPcInfo($id,$type, $start_time, $end_time, $page_no, $page_size)
{ {
...@@ -712,6 +725,10 @@ class PerformanceService ...@@ -712,6 +725,10 @@ class PerformanceService
$addUserList[$key]["is_my"] = 0; $addUserList[$key]["is_my"] = 0;
} }
$addUserList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $addUserList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
$follow = new UPhoneFollowPp();
$res = $follow->getLastPhoneFollowTime($val['id']);
$list[$key]["last_phone_follow_time"] = $res[0]['create_time'] ? $res[0]['create_time'] : '暂无!';
} }
return [ "code" => 200, "date" => $addUserList ]; return [ "code" => 200, "date" => $addUserList ];
} }
...@@ -761,7 +778,7 @@ class PerformanceService ...@@ -761,7 +778,7 @@ class PerformanceService
$params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time); $params = $this->getAgentIdPcInfo($id, $type, $start_time, $end_time);
if (!$params) if (!$params)
return [ "code" => 101, "date" => "传入的参数错误" ]; return [ "code" => 101, "date" => "传入的参数错误" ];
$field = "a.id,a.user_name,a.predict_see_time,a.create_time,a.report_agent_name,c.internal_title as house_title,c.shop_type,e.store_name"; $field = "a.id,a.user_name,a.predict_see_time,a.create_time,a.report_agent_name,c.internal_title as house_title,c.shop_type,e.store_name,b.id as order_id";
$reportList = $this->reportModel->getAddReportListPcInfo($params, $field, $page_no, $page_size); $reportList = $this->reportModel->getAddReportListPcInfo($params, $field, $page_no, $page_size);
foreach ($reportList as $key => $val) { foreach ($reportList as $key => $val) {
$reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]); $reportList[$key]["user_phone"] = preg_replace('/(\d{3})\d{4}(\d{4})/', '$1****$2', $val["user_phone"]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment