Skip to content

T
tl_estate
Commit 2ecbbfc8 authored by zhuwei's avatar zhuwei
Browse files
Options

1

parent cc55aedf
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 23 deletions
application/api_broker/controller/User.php
View file @ 2ecbbfc8
......@@ -143,26 +143,18 @@ class User extends Basic
if (isset($params['user_status'])) {
$conditions['user_status'] = $params['user_status'];
}
$is_search = false;
if (isset($params['id'])) {
$conditions['id'] = $params['id'];
$is_search = true;
}
if (isset($params['user_name'])) {
if (strlen($params['user_name']) > 20) {
return $this->response(101, '输入内容长度超限');
}
$conditions['user_name'] = array( "like", "%" . trim($params['user_name']) . "%" );
$is_search = true;
}
if (isset($params['user_nick'])) {
if (strlen($params['user_nick']) > 20) {
return $this->response(101, '输入内容长度超限');
}
$conditions['user_nick'] = array( "like", "%" . trim($params['user_nick']) . "%" );
$is_search = true;
}
if (isset($params['user_phone'])) {
if (!is_numeric($params['user_phone'])) {
......@@ -174,7 +166,6 @@ class User extends Basic
}
$conditions['user_phone'] = array( "like", "%" . trim($params['user_phone']) . "%" );
$is_search = true;
}
if (isset($params['yetai'])) {
$conditions['industry_type'] = array( "like", "%" . trim($params['yetai']) . "%" );
......@@ -215,7 +206,7 @@ class User extends Basic
//全部客户列表 排除排除纯房东客户
$conditions['user_label'] = array( "neq", 2 );
//根据时间搜索，要能搜到保护期客户
if(!$is_search && !isset($conditions['create_time'])){
if(!isset($conditions['create_time'])){
//排除排除保护期内的客户 将截止日期大于当前时间的数据排除掉
$time_now = date('Y-m-d H:i:s');
$conditions['protect_time'] = array('lt',$time_now);
......@@ -232,6 +223,10 @@ class User extends Basic
if(isset($params['entrust_type']) && is_numeric($params['entrust_type'])){
$conditions['entrust_type'] =$params['entrust_type'];
}
//具体业态搜索
if (isset($params['concrete_industry']) ) {
$conditions['concrete_industry'] = [ 'LIKE', '%' . $params['concrete_industry'] . '%' ];
}
}
......
application/index/service/UserAgentService.php
View file @ 2ecbbfc8
......@@ -53,12 +53,12 @@ class UserAgentService
*/
public function findUserAgent($site_id,$agent_id = 0,$user_id = 0)
{
$params['site_id'] = $site_id;
$params['a.site_id'] = $site_id;
if($user_id > 0){
$params['user_id'] = $user_id;
$params['a.user_id'] = $user_id;
}
if($agent_id > 0){
$params['agent_id'] = $agent_id;
$params['a.agent_id'] = $agent_id;
}
$field = 'a.id,a.user_id,a.site_id,a.agent_id,c.name,c.phone';
$user_agent_info = $this->m_user_agent->getUserAgent($field,$params);
......
application/index/service/UserService.php
View file @ 2ecbbfc8
......@@ -73,9 +73,9 @@ class UserService
$future_time = date("Y-m-d H:i:s",strtotime("+1 day"));//24小时前的时间
$data['protect_time'] = $future_time;
} else {
$user_data = $this->user->getUserById('id,agent_id,referrer_id,referrer_source,user_name,
site_ids,entrust_type', $id);
if (empty($user_data['id'])) {
$result['status'] = 'fail';
$result['msg'] = '没有该用户信息';
......@@ -83,6 +83,7 @@ class UserService
}
$user_agent_res = $s_user_agent->findUserAgent($site_id,0, $id);
$agent_id_old = empty($user_agent_res['agent_id']) ? 0 : $user_agent_res['agent_id'];
$referrer_id_old = empty($user_data['referrer_id']) ? 0 : $user_data['referrer_id'];
......@@ -91,6 +92,9 @@ class UserService
$site_id_old = empty($user_data['site_ids']) ? '' : $user_data['site_ids'];
$entrust_type_old = isset($user_data['entrust_type']) ? $user_data['entrust_type'] : '';
$concrete_industry_old = isset($user_data['concrete_industry']) ? $user_data['concrete_industry'] : '';
$price_demand_old = isset($user_data['price_demand']) ? $user_data['price_demand'] : '';
$area_demand_old = isset($user_data['area_demand']) ? $user_data['area_demand'] : '';
if ($data['referrer_source'] == 20) {
......@@ -117,10 +121,12 @@ class UserService
// $this->setUserSites($id, $data['site_id']);//设置站点
//操作完成之后判断下是什么动作
$user_agent_res = $s_user_agent->findUserAgent($site_id,0,$id);
if (!$user_agent_res) {
$s_user_agent->addUserAgent($data['agent_id'],$id,$site_id);
$s_user_agent->addUserAgent($data['agents_id'],$id,$site_id);
}else{
if (!empty($data['agents_id']) && ($data['agents_id'] != $agent_id_old)) {
$s_user_agent->changeUserAgent($data['agent_id'],$id,$site_id);
......@@ -132,7 +138,6 @@ class UserService
if (!empty($data['agents_id'])) {
$this->recordGuest($data['agents_id'], $agent_id_old, $id, $user_name, $type);
}
//记录邀请人 修改记录
if (!empty($data['referrer_id'])) {
$this->recordReferrer($data['referrer_id'], $data['referrer_source'], $id, $referrer_id_old);
......@@ -154,6 +159,18 @@ class UserService
$this->userFieldChangeLog($this->operation_id,$id,$entrust_type_old,$data['entrust_type'],'entrust_type');
}
//具体业态 修改记录
if (!empty($data['concrete_industry']) && ($data['concrete_industry'] != $concrete_industry_old)) {
$this->userFieldChangeLog($this->operation_id,$id,$concrete_industry_old,$data['concrete_industry'],'entrust_type');
}
//价格需求 修改记录
if (!empty($data['price_demand']) && ($data['price_demand'] != $price_demand_old)) {
$this->userFieldChangeLog($this->operation_id,$id,$price_demand_old,$data['price_demand'],'entrust_type');
}
//面积需求 修改记录
if (!empty($data['area_demand']) && ($data['area_demand'] != $area_demand_old)) {
$this->userFieldChangeLog($this->operation_id,$id,$area_demand_old,$data['area_demand'],'entrust_type');
}
//更新业绩统计
$agent = new AAgents();
$agent_data = $agent->getAgentInfo('id,name,phone,store_id,district_id', $data['agents_id']);
......@@ -208,6 +225,21 @@ class UserService
$entrust_type_str =array(0=>'找铺',1=>'找办公楼');//0找铺 1找办公楼
$remark = "客户委托类型被【{$agent_data['name']}】由【{$entrust_type_str[$field_old]}】修改为【{$entrust_type_str[$field_old_new]}】";
$this->operating_records($this->operation_id, 9, $remark, $user_id);
//具体业态
case 'concrete_industry':
$remark = "客户具体业态被【{$agent_data['name']}】由【{$field_old}】修改为【{$field_old_new}】";
$this->operating_records($this->operation_id, 9, $remark, $user_id);
break;
//价格需求
case 'price_demand':
$remark = "客户价格需求被【{$agent_data['name']}】由【{$field_old}】修改为【{$field_old_new}】";
$this->operating_records($this->operation_id, 9, $remark, $user_id);
break;
//面积需求
case 'area_demand':
$remark = "客户面积需求被【{$agent_data['name']}】由【{$field_old}】修改为【{$field_old_new}】";
$this->operating_records($this->operation_id, 9, $remark, $user_id);
break;
break;
default:
}
......@@ -283,7 +315,6 @@ class UserService
{
$agent = new AAgents();
$agent_data = $agent->getAgentSiteInfo('a.name,a.phone,b.name as site_name', $agent_id);
$remark = '';
if ($type == 'add') {
$remark = "[{$agent_data['site_name']}]新增为{$agent_data['name']}-{$agent_data['phone']}";
......
application/model/AAgents.php
View file @ 2ecbbfc8
......@@ -924,17 +924,20 @@ class AAgents extends BaseModel
/**
* 业务员站点信息
* @param $field
* @param $params
* @param $agent_id
* @return array|false|\PDOStatement|string|\think\Model
*/
public function getAgentSiteInfo($field,$params)
public function getAgentSiteInfo($field,$agent_id)
{
$result = $this->field($field)
if ($agent_id != '') {
$where['a.id'] = $agent_id;
}
$result = Db::table($this->table)
->alias('a')
->join('a_site b', 'a.site_id = d.id', 'left')
->where($params)
->field($field)
->join('a_site b', 'a.site_id = b.id', 'left')
->where($where)
->find();
//echo $this->getLastSql();
return $result;
}
......
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