|
|
@@ -167,8 +167,8 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
if (!empty($db_province_id)) {
|
|
|
$product_data['province_id'] = $db_province_id;
|
|
|
}else{
|
|
|
- //逆推省份ID失败,则置空省份名称
|
|
|
- $province_name ='';
|
|
|
+ //逆推省份ID失败,则修改为未知名称
|
|
|
+ $province_name ='未知';
|
|
|
}
|
|
|
} else {
|
|
|
//尝试从地区详情里面匹配省份名称
|
|
|
@@ -197,26 +197,28 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
if (!empty($db_city_id)) {
|
|
|
$product_data['city_id'] = $db_city_id;
|
|
|
}else{
|
|
|
- $city_name ='';
|
|
|
+ $city_name ='未知';
|
|
|
}
|
|
|
} else {
|
|
|
$db_city_id = $CitysModel->where([['name', '=', $city_name], ['level', '=', '2']])->value('id');
|
|
|
if (!empty($db_city_id)) {
|
|
|
$product_data['city_id'] = $db_city_id;
|
|
|
}else{
|
|
|
- $city_name ='';
|
|
|
+ $city_name ='未知';
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
- //尝试从地区详情里面匹配市名称
|
|
|
- $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
|
|
|
- foreach ($db_city_name_list as $db_city_name) {
|
|
|
- if (strpos($product_data['area_info'], $db_city_name) !== false) {
|
|
|
- $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
|
|
|
- $product_data['city_id'] = $db_city_id;
|
|
|
- $product_data['city_name'] = $db_city_name;
|
|
|
- $city_name = $db_city_name;
|
|
|
- break;
|
|
|
+ if (trim($product_data['area_info']) != '') {
|
|
|
+ //尝试从地区详情里面匹配市名称
|
|
|
+ $db_city_name_list = $CitysModel->where([['level', '=', '2']])->pluck('name')->toarray();
|
|
|
+ foreach ($db_city_name_list as $db_city_name) {
|
|
|
+ if (strpos($product_data['area_info'], $db_city_name) !== false) {
|
|
|
+ $db_city_id = $CitysModel->where([['name', '=', $db_city_name], ['level', '=', '2']])->value('id');
|
|
|
+ $product_data['city_id'] = $db_city_id;
|
|
|
+ $product_data['city_name'] = $db_city_name;
|
|
|
+ $city_name = $db_city_name;
|
|
|
+ break;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -271,8 +273,8 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
if (!empty($db_shipment_province_id)) {
|
|
|
$product_data['shipment_province_id'] = $db_shipment_province_id;
|
|
|
}else{
|
|
|
- //逆推省份ID失败,则置空省份名称
|
|
|
- $shipment_province_name = '';
|
|
|
+ //逆推省份ID失败,则修改为未知名称
|
|
|
+ $shipment_province_name = '未知';
|
|
|
}
|
|
|
}
|
|
|
if (trim($shipment_city_name) != '') {
|
|
|
@@ -290,16 +292,16 @@ class ViolationProductDataJobs implements ShouldQueue
|
|
|
if (!empty($db_shipment_city_id)) {
|
|
|
$product_data['shipment_city_id'] = $db_shipment_city_id;
|
|
|
}else{
|
|
|
- //逆推市ID失败,则置空市名称
|
|
|
- $shipment_city_name = '';
|
|
|
+ //逆推市ID失败,则修改为未知名称
|
|
|
+ $shipment_city_name = '未知';
|
|
|
}
|
|
|
} else {
|
|
|
$db_shipment_city_id = $CitysModel->where([['name', '=', $shipment_city_name], ['level', '=', '2']])->value('id');
|
|
|
if (!empty($db_shipment_city_id)) {
|
|
|
$product_data['shipment_city_id'] = $db_shipment_city_id;
|
|
|
}else{
|
|
|
- //逆推市ID失败,则置空市名称
|
|
|
- $shipment_city_name = '';
|
|
|
+ //逆推市ID失败,则修改为未知名称
|
|
|
+ $shipment_city_name = '未知';
|
|
|
}
|
|
|
}
|
|
|
}
|