|
|
@@ -267,7 +267,7 @@ class Customer extends Base
|
|
|
if(!empty($v['company'])) {
|
|
|
CustomerModel::where('company',$v['company'])->update(['spread_id' => $customer['spread_id']]);
|
|
|
} else {
|
|
|
- CustomerModel::where('id',$v['id'])->update(['spread_id' => $param['id']]);
|
|
|
+ CustomerModel::where('id',$v['id'])->update(['spread_id' => $customer['id']]);
|
|
|
}
|
|
|
$ranking = new RankingModel();
|
|
|
$ranking->setGuanlian($v['id']); // 修改记录表
|
|
|
@@ -386,12 +386,8 @@ class Customer extends Base
|
|
|
$customer = new CustomerModel();
|
|
|
$user = $customer->see($id);
|
|
|
if (!$user) return json(['code' => 100, "msg" => '网络错误']);
|
|
|
- $whereOr = [
|
|
|
-// 'email' => $user['email'],
|
|
|
- 'name' => $user['name'],
|
|
|
-// 'phone' => $user['phone'],
|
|
|
- ];
|
|
|
- $aid = $customer->where('email',$user['email'])->field('spread_id')->select()->toArray();
|
|
|
+ $aid = $customer->where('email',$user['email'])->where('email','neq','')->field('spread_id')->select()->toArray();
|
|
|
+
|
|
|
foreach ($aid as $k => $v) {
|
|
|
$v = join(',', $v); //降维,也可以用implode,将一维数组转换为用逗号连接的字符串
|
|
|
$temp[$k] = $v;
|
|
|
@@ -537,6 +533,7 @@ class Customer extends Base
|
|
|
$count = $customer->getCustomerCount($map,$whereOr);
|
|
|
$lists = $customer->getCustomersByWhere($map, $od, $Nowpage, $limits,$whereOr);
|
|
|
foreach ($lists as $k => $v) {
|
|
|
+ $lists[$k]['admin_name'] = Db::name('admin')->where('id',$v['spread_id'])->column('nickname');
|
|
|
$v['tname'] = Db::name('type')->where('id', 'in', trim($v['type'],','))->column('name');
|
|
|
$v['pname'] = Db::name('product')->where('id', 'in', trim($v['product'],','))->column('product_name');
|
|
|
$v['type_name'] = implode('&&', $v['tname']);
|
|
|
@@ -633,6 +630,7 @@ class Customer extends Base
|
|
|
$count = $customer->getCustomerCount($map,$whereOr);
|
|
|
$lists = $customer->getCustomersByWhere($map, $od, $Nowpage, $limits,$whereOr);
|
|
|
foreach ($lists as $k => $v) {
|
|
|
+ $lists[$k]['admin_name'] = Db::name('admin')->where('id',$v['spread_id'])->column('nickname');
|
|
|
$v['tname'] = Db::name('type')->where('id', 'in', trim($v['type'],','))->column('name');
|
|
|
$v['pname'] = Db::name('product')->where('id', 'in', trim($v['product'],','))->column('product_name');
|
|
|
$v['type_name'] = implode('&&', $v['tname']);
|
|
|
@@ -741,13 +739,14 @@ class Customer extends Base
|
|
|
$count = $customer->getCustomerCount($map,$whereOr);
|
|
|
$lists = $customer->getCustomersByWhere($map, $od, $Nowpage, $limits,$whereOr);
|
|
|
foreach ($lists as $k => $v) {
|
|
|
+ $lists[$k]['admin_name'] = Db::name('admin')->where('id',$v['spread_id'])->column('nickname');
|
|
|
$v['tname'] = Db::name('type')->where('id', 'in', trim($v['type'],','))->column('name');
|
|
|
$v['pname'] = Db::name('product')->where('id', 'in', trim($v['product'],','))->column('product_name');
|
|
|
$v['type_name'] = implode('&&', $v['tname']);
|
|
|
$v['product_name'] = implode('&&', $v['pname']);
|
|
|
$v['guanlian_num'] = Db::name('customer')->where('guanlianid', $v['id'])->count();
|
|
|
// 关联上级客户的公司名字
|
|
|
- $lists[$k]['guanlian_company'] = Db::name('customer')->where('id',$v['guanlianid'])->value('company');
|
|
|
+ $lists[$k]['guanlian_company'] = Db::name('customer')->where('id',$v['guanlianid'])->value('website');
|
|
|
$web = explode('##',$v['website']);
|
|
|
foreach ($web as $vv) {
|
|
|
$domain = strstr($vv, 'http');
|
