|
@@ -592,6 +592,25 @@ class CustomerService extends Service
|
|
|
$customer_info_map[$value['customer_id']][] = $value;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ $customer_info = CustomerInfo::where('del_time',0)
|
|
|
+ ->whereIn('customer_id',array_column($data['data'],'id'))
|
|
|
+ ->where('type',CustomerInfo::type_two)
|
|
|
+ ->select('data_id','customer_id')
|
|
|
+ ->get()->toArray();
|
|
|
+ $emp_map = Employee::whereIn('id',array_column($customer_info,'data_id'))
|
|
|
+ ->pluck('emp_name','id')
|
|
|
+ ->toArray();
|
|
|
+ $fz = [];
|
|
|
+ foreach ($customer_info as $value){
|
|
|
+ $tmp = $emp_map[$value['data_id']] ?? "";
|
|
|
+
|
|
|
+ if(isset($fz[$value['customer_id']])){
|
|
|
+ $fz[$value['customer_id']] .= ',' . $tmp;
|
|
|
+ }else{
|
|
|
+ $fz[$value['customer_id']] = $tmp;
|
|
|
+ }
|
|
|
+ }
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
if(! empty($value['address1'])) {
|
|
|
$tmp = json_decode($value['address1'],true);
|
|
@@ -614,6 +633,7 @@ class CustomerService extends Service
|
|
|
$data['data'][$key]['crt_time'] = $value['crt_time'] ? date('Y-m-d H:i:s',$value['crt_time']) : '';
|
|
|
$data['data'][$key]['crt_name'] = $emp[$value['crt_id']] ?? '';
|
|
|
$data['data'][$key]['customer_detail'] = $customer_info_map[$value['id']] ?? [];
|
|
|
+ $data['data'][$key]['fz'] = $fz[$value['id']] ?? [];
|
|
|
}
|
|
|
|
|
|
return $data;
|