diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php index 484244b4..38f9d8dd 100644 --- a/admin/controllers/receiver/Orders.php +++ b/admin/controllers/receiver/Orders.php @@ -402,16 +402,17 @@ class Orders extends HD_Controller $params['size'] = 10000; $indexs = []; if ($params['export_type']) { - echo 'ee';exit; $result = $this->orderslist->export_data($params['status_pid'], $params); $fileName = '保险明细'; $data = $result['data']; $indexs = $result['indexs']; } else { $fieldAry = $this->orderslist->get_fields($params['status_pid'], 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } + $indexs['admin_name'] = '销售顾问'; $result = $this->orderslist->lists($params['status_pid'], $params); $fileName = $result['_title']; foreach ($result['lists'] as $key => $value) { diff --git a/admin/controllers/receiver/order/Agent.php b/admin/controllers/receiver/order/Agent.php index 32d93319..8f026da3 100644 --- a/admin/controllers/receiver/order/Agent.php +++ b/admin/controllers/receiver/order/Agent.php @@ -61,6 +61,7 @@ class Agent extends HD_Controller{ $indexs = $result['indexs']; }else{ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/controllers/receiver/order/Bill.php b/admin/controllers/receiver/order/Bill.php index 356786e2..228b0ee3 100644 --- a/admin/controllers/receiver/order/Bill.php +++ b/admin/controllers/receiver/order/Bill.php @@ -73,6 +73,7 @@ class Bill extends HD_Controller $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); $fieldAry['bill_time']['title'] = '开票时间'; $fieldAry['vin']['title'] = '车架号'; + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/controllers/receiver/order/Ckcar.php b/admin/controllers/receiver/order/Ckcar.php index c36ac678..d0c35f01 100644 --- a/admin/controllers/receiver/order/Ckcar.php +++ b/admin/controllers/receiver/order/Ckcar.php @@ -69,6 +69,7 @@ class Ckcar extends HD_Controller $indexs = $result['indexs']; }else{ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/controllers/receiver/order/Deal.php b/admin/controllers/receiver/order/Deal.php index 40bab391..ec9996a8 100644 --- a/admin/controllers/receiver/order/Deal.php +++ b/admin/controllers/receiver/order/Deal.php @@ -71,6 +71,7 @@ class Deal extends HD_Controller $indexs = $result['indexs']; }else{ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/controllers/receiver/order/Delivery.php b/admin/controllers/receiver/order/Delivery.php index 97a75d00..b666b281 100644 --- a/admin/controllers/receiver/order/Delivery.php +++ b/admin/controllers/receiver/order/Delivery.php @@ -69,6 +69,7 @@ class Delivery extends HD_Controller $indexs = $result['indexs']; }else{ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/controllers/receiver/order/Sign.php b/admin/controllers/receiver/order/Sign.php index b11cb9ea..a34fc3d9 100644 --- a/admin/controllers/receiver/order/Sign.php +++ b/admin/controllers/receiver/order/Sign.php @@ -70,6 +70,7 @@ class Sign extends HD_Controller $indexs = $result['indexs']; }else{ $fieldAry = $this->orderslist->get_fields($this->status_pid, 1); + $fieldAry['admin_name'] = ['title'=>'销售顾问']; foreach ($fieldAry as $key => $value) { $indexs[$key] = $value['title']; } diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php index 59aeef3f..0be098fd 100644 --- a/admin/libraries/OrdersList.php +++ b/admin/libraries/OrdersList.php @@ -214,7 +214,7 @@ class OrdersList $count = $this->ci->mdOrders->count($where); $lists = []; if ($count) { - $fileds = "id,rid,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time,biz_id,bill_time"; + $fileds = "id,rid,name,mobile,brand_id,s_id,v_id,cor_id,incor_id,price,deposit,payway,status,c_time,biz_id,bill_time,admin_id"; $rows = $this->ci->mdOrders->select($where, "c_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -228,6 +228,10 @@ class OrdersList //获取来源 $cfroms = $this->ci->mdCluesCfrom->get_map_by_ids($cf_id_arr, 'id,title'); } + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); //门店 $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); !$str_biz_ids && $str_biz_ids = 0; @@ -266,6 +270,7 @@ class OrdersList $fields['cf_title'] = $customers[$val['rid']][0]['cf_title']; $fields['cf_clues'] = $customers[$val['rid']][0]['cf_clues']; $fields['cf_name'] = $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title']; + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } } @@ -639,7 +644,7 @@ class OrdersList if ($count) { $this->ci->load->model('sys/sys_finance_model'); $fileds = "$t1.o_id,$t1.title,$t1.year,$t1.first_price,$t1.status,$t1.c_time,"; - $fileds .= "$t2.rid,$t2.id,$t2.name,$t2.mobile,$t2.sid,$t2.finance_id,$t2.money_json,$t2.bill_time"; + $fileds .= "$t2.rid,$t2.id,$t2.name,$t2.mobile,$t2.sid,$t2.finance_id,$t2.money_json,$t2.bill_time,$t2.admin_id"; $rows = $this->ci->order_loans_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -655,6 +660,10 @@ class OrdersList } $finance_arr = array_column($rows, 'finance_id'); $finance_rows = $this->ci->sys_finance_model->get_map_by_ids($finance_arr, 'id,title'); + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); foreach ($rows as $key => $val) { $fields = array(); $money_json = json_decode($val['money_json'], true); @@ -673,6 +682,7 @@ class OrdersList $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'] && $cf_name = $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'].'(线上)
'; $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)'; $fields['cf_name'] = $cf_name; + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } } @@ -813,7 +823,7 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time"; + $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time,$t2.admin_id"; $rows = $this->ci->order_ckcars_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -827,6 +837,10 @@ class OrdersList //获取来源 $cfroms = $this->ci->mdCluesCfrom->get_map_by_ids($cf_id_arr, 'id,title'); } + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); //门店 $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); !$str_biz_ids && $str_biz_ids = 0; @@ -866,6 +880,7 @@ class OrdersList $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'] && $cf_name = $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'].'(线上)
'; $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)'; $fields['cf_name'] = $cf_name; + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } } @@ -1016,7 +1031,7 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time,$t2.item_id"; + $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time,$t2.item_id,$t2.admin_id"; $rows = $this->ci->order_bills_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -1030,6 +1045,10 @@ class OrdersList //获取来源 $cfroms = $this->ci->mdCluesCfrom->get_map_by_ids($cf_id_arr, 'id,title'); } + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); //门店 $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); !$str_biz_ids && $str_biz_ids = 0; @@ -1072,6 +1091,7 @@ class OrdersList $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)'; $fields['cf_name'] = $cf_name; $fields['item_id'] = $val['item_id']; + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } } @@ -1212,7 +1232,7 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.u_time,$t1.c_time,$t1.jsondata,$t1.ins_img,$t1.car_img,"; - $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time"; + $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time,$t2.admin_id"; $rows = $this->ci->order_agents_model->select_order($where, "$t1.u_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -1226,6 +1246,10 @@ class OrdersList //获取来源 $cfroms = $this->ci->mdCluesCfrom->get_map_by_ids($cf_id_arr, 'id,title'); } + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); //门店 $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); !$str_biz_ids && $str_biz_ids = 0; @@ -1271,6 +1295,7 @@ class OrdersList $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)'; $fields['cf_name'] = $cf_name; $fields['u_time'] = date('Y-m-d H:i',strtotime($val['u_time'])); + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } } @@ -1411,7 +1436,7 @@ class OrdersList $lists = []; if ($count) { $fileds = "$t1.o_id,$t1.status,$t1.c_time,"; - $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time"; + $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time,$t2.admin_id"; $rows = $this->ci->order_deliverys_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds); //客户来源 $str_rids = implode(',', array_unique(array_column($rows, 'rid'))); @@ -1425,6 +1450,10 @@ class OrdersList //获取来源 $cfroms = $this->ci->mdCluesCfrom->get_map_by_ids($cf_id_arr, 'id,title'); } + //获取销售 + $str_admin_ids = implode(',', array_unique(array_column($rows, 'admin_id'))); + !$str_admin_ids && $str_admin_ids = 0; + $map_admin = $this->ci->mdLichebUsers->map('id', 'uname', array("id in({$str_admin_ids})" => null),'','','','id,uname'); //门店 $str_biz_ids = implode(',', array_unique(array_column($rows, 'biz_id'))); !$str_biz_ids && $str_biz_ids = 0; @@ -1464,6 +1493,7 @@ class OrdersList $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'] && $cf_name = $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'].'(线上)
'; $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)'; $fields['cf_name'] = $cf_name; + $fields['admin_name'] = $map_admin[$val['admin_id']] ? $map_admin[$val['admin_id']] : ''; $lists[] = $fields; } }