会员升级

app/controller/admin/v1/user/User.php

@@ -501,7 +501,7 @@ class User extends AuthController
             ['area', 0],
             ['street', 0],
             ['spread_uid', -1],
-            ['area_admin', 0],
+            ['area_admin', -1],
             ['area_admin_province', ''],
             ['area_admin_city', ''],
             ['area_admin_district', ''],
@@ -560,20 +560,37 @@ class User extends AuthController
         if ($data['extend_info']) {
             $data['extend_info'] = $this->services->handelExtendInfo($data['extend_info']);
         }
-        if ($data['area_admin'] > 0) {
-            if (!in_array($data['area_admin'], [1, 2, 3])) {
+        if ($data['area_admin'] >= 0) {
+            if (!in_array($data['area_admin'], [0, 1, 2, 3])) {
                 return $this->fail('请选择正确的代理等级');
             }
-            if ($data['area_admin'] == 3 && !$data['area_admin_province']) {
-                return $this->fail('请选择代理省份');
+            if ($data['area_admin'] == 3) {
+                if (!$data['area_admin_province'])
+                    return $this->fail('请选择代理省份');
+                else {
+                    $data['area_admin_city'] = '';
+                    $data['area_admin_district'] = '';
+                }
+
+            }
+            if ($data['area_admin'] == 2) {
+                if (!$data['area_admin_province'] || !$data['area_admin_city'])
+                    return $this->fail('请选择代理省市');
+                else {
+                    $data['area_admin_district'] = '';
+                }
             }
-            if ($data['area_admin'] == 2 && (!$data['area_admin_province'] || !$data['area_admin_city'])) {
-                return $this->fail('请选择代理省市');
+            if ($data['area_admin'] == 1) {
+                if (!$data['area_admin_province'] || !$data['area_admin_city'] || !$data['area_admin_district'])
+                    return $this->fail('请选择代理省市区');
             }
-            if ($data['area_admin'] == 1 && (!$data['area_admin_province'] || !$data['area_admin_city'] || !$data['area_admin_district'])) {
-                return $this->fail('请选择代理省市区');
+            if ($data['area_admin'] == 0) {
+                $data['area_admin_province'] = '';
+                $data['area_admin_city'] = '';
+                $data['area_admin_district'] = '';
             }
         } else {
+            $data['area_admin'] = 0;
             $data['area_admin_province'] = '';
             $data['area_admin_city'] = '';
             $data['area_admin_district'] = '';

app/services/user/UserServices.php

@@ -889,7 +889,7 @@ class UserServices extends BaseServices
             $edit['phone'] = $data['phone'];
             $edit['addres'] = $data['addres'];
             $edit['group_id'] = $data['group_id'];
-            if (isset($data['area_admin'])) {
+            if (isset($data['area_admin']) && $data['area_admin'] >= 0) {
                 $edit['area_admin'] = $data['area_admin'];
                 $edit['area_admin_province'] = $data['area_admin_province'];
                 $edit['area_admin_city'] = $data['area_admin_city'];