2023-5-22-1 新增服务区

app/api/controller/User.php

@@ -347,7 +347,7 @@ class User extends BaseController
         if(!empty($post["service_area"]) && is_array($post["service_area"])){
             $saveAre=[];
             foreach($post["service_area"] as  $v){
-                $str = str_replace(['省','市','区','县'],['','','',''],$v);
+                $str = preg_replace('/(省|市|区|县|市辖区)/u', '', $v);
                 $arr = explode(",",$str);
                 $city_id = $cityModel->where('merger_name','like',"%".$arr[1].",".$arr[2])->value('id');
                 if(!$city_id) $city_id = $cityModel->where('merger_name','like',"%".$arr[0].",".$arr[1])->value('id');
@@ -405,12 +405,17 @@ class User extends BaseController
         }
 
 
+        //生成编码
         $r = (new InfoAudit)->insertGetId($save);
-        if(!$r){
+        if (!$r) {
             return app('json')->fail("系统错误");
         }
-        $no = "MYJ".date("Ymd").$r;
-        (new InfoAudit)->where("id",$r)->update(["no"=>$no]);
+        $exist = (new InfoAudit)->where('uid', $save['uid'])->find();
+        if (!$exist ||!$exist['no']) {
+            $id = str_pad($r, 5, "0", STR_PAD_LEFT);
+            $no = "MYJ" . date("ym") . $id;
+            (new InfoAudit)->where("id", $r)->update(["no" => $no]);
+        }
         return app('json')->success("提交成功,请耐心等待审核");
     }
     /**