|
|
@@ -376,10 +376,13 @@ class CustomerService extends Service
|
|
|
$customer['product_category'] = $product_category ? json_decode($product_category,true) : [];
|
|
|
}
|
|
|
|
|
|
+ $address_map = config('address');
|
|
|
+ $address_str = [];
|
|
|
if(! empty($customer['address1'])) {
|
|
|
$tmp = json_decode($customer['address1'],true);
|
|
|
+ $this->findLabelsByValue($address_map,$tmp,$address_str);
|
|
|
$customer['address1'] = $tmp;
|
|
|
- $tmp = implode(' ',$tmp);
|
|
|
+ $tmp = implode(' ',$address_str);
|
|
|
$tmp .= ' ' . $customer['address2'];
|
|
|
$address = $tmp;
|
|
|
}else{
|
|
|
@@ -718,10 +721,13 @@ class CustomerService extends Service
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $address_map = config('address');
|
|
|
foreach ($data['data'] as $key => $value){
|
|
|
+ $address_str = [];
|
|
|
if(! empty($value['address1'])) {
|
|
|
$tmp = json_decode($value['address1'],true);
|
|
|
- $tmp = implode(' ',$tmp);
|
|
|
+ $this->findLabelsByValue($address_map,$tmp,$address_str);
|
|
|
+ $tmp = implode(' ',$address_str);
|
|
|
$tmp .= ' ' . $value['address2'];
|
|
|
$address = $tmp;
|
|
|
}else{
|