edit

app/Http/Controllers/Api/SynJdRapidController.php

@@ -335,7 +335,17 @@ class SynJdRapidController extends BaseController
                             $orders[$kk]['shr_name'] = $vv['buyerFullName'];//姓名
                             $tel = explode(',', $vv['buyerMobile']);
                             $orders[$kk]['shr_phone'] = $tel[0].'-'.$tel[1];//$vv['telephone'];//电话
-                            $areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
+                            if(in_array($vv['buyerCityName'], ['北京市','北京'])){
+                                $areaProvince[0] = '北京';
+                            }elseif(in_array($vv['buyerCityName'], ['上海市','上海'])){
+                                $areaProvince[0] = '上海';
+                            }elseif(in_array($vv['buyerCityName'], ['天津市','天津'])){
+                                $areaProvince[0] = '天津';
+                            }elseif(in_array($vv['buyerCityName'], ['重庆市','重庆'])){
+                                $areaProvince[0] = '重庆';
+                            }else {
+                                $areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
+                            }
                             $orders[$kk]['shr_sheng'] = $areaProvince[0];//省份
                             $orders[$kk]['shr_shi'] = $vv['buyerCityName'];//城市
                             $orders[$kk]['shr_xian'] = $vv['buyerCountryName'];//区县
@@ -382,7 +392,17 @@ class SynJdRapidController extends BaseController
                         $tel = explode(',', $vv['buyerMobile']);
                         $arr[$kk]['mobile'] = $tel[0].'-'.$tel[1];//$vv['telephone'];//电话
                         $arr[$kk]['telephone'] = $tel;//客户电话
-                        $areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
+                        if(in_array($vv['buyerCityName'], ['北京市','北京'])){
+                            $areaProvince[0] = '北京';
+                        }elseif(in_array($vv['buyerCityName'], ['上海市','上海'])){
+                            $areaProvince[0] = '上海';
+                        }elseif(in_array($vv['buyerCityName'], ['天津市','天津'])){
+                            $areaProvince[0] = '天津';
+                        }elseif(in_array($vv['buyerCityName'], ['重庆市','重庆'])){
+                            $areaProvince[0] = '重庆';
+                        }else {
+                            $areaProvince = explode($vv['buyerCityName'], $vv['buyerFullAddress']);
+                        }
                         $arr[$kk]['province'] = $areaProvince[0];//省份
                         $arr[$kk]['city'] = $vv['buyerCityName'];//城市
                         $arr[$kk]['county'] = $vv['buyerCountryName'];//区县

app/Http/Controllers/Orders/OrderListController.php

@@ -1393,7 +1393,7 @@ class OrderListController extends BaseController
             		$note_type = "派工单列表";//$Input['note_type'];
             		$note_content = $request->input('note_content');
             		$send_num = $Input['serial_number'];
-            		$public_state = 1;
+            		$public_state = 2;
             		if ($request->input('note_content')){
             			$rest = CommonService::accMe($sys_num,$note_type,$note_content,$send_num,$public_state,$session_token['admin_groupnew'],$session_token['admin_acc'],$session_token['id']);
             		}