第一期工程

app/Controller/UserController.php

@@ -64,17 +64,17 @@ class UserController extends AbstractController
         $requireData['last_login_ip'] = $loginIp;
         $requireData['admin_id'] = Context::get("UserId");
 
-        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id'])?end($requireData['administrative_unit_arr_id']):0;
-        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id'])?json_encode($requireData['administrative_unit_arr_id']):'';
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0 ?end($requireData['administrative_unit_arr_id']):0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0?json_encode($requireData['administrative_unit_arr_id']):'';
 
-        $requireData['address_id'] = isset($requireData['address_arr_id'])?end($requireData['address_arr_id']):0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id'])?json_encode($requireData['address_arr_id']):'';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0?end($requireData['address_arr_id']):0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0 ?json_encode($requireData['address_arr_id']):'';
 
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id'])?end($requireData['native_place_arr_id']):0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id'])?json_encode($requireData['native_place_arr_id']):'';
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?end($requireData['native_place_arr_id']):0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?json_encode($requireData['native_place_arr_id']):'';
 
-        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?end($requireData['city_arr_id']):0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?json_encode($requireData['city_arr_id']):'';
 
         $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
         $result =  $this->userServiceClient->createUser($requireData);
@@ -111,18 +111,18 @@ class UserController extends AbstractController
         }
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
-        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id'])?end($requireData['administrative_unit_arr_id']):0;
-        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id'])?json_encode($requireData['administrative_unit_arr_id']):'';
 
-        $requireData['address_id'] = isset($requireData['address_arr_id'])?end($requireData['address_arr_id']):0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id'])?json_encode($requireData['address_arr_id']):'';
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0 ?end($requireData['administrative_unit_arr_id']):0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id'])>0?json_encode($requireData['administrative_unit_arr_id']):'';
 
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id'])?end($requireData['native_place_arr_id']):0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id'])?json_encode($requireData['native_place_arr_id']):'';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0?end($requireData['address_arr_id']):0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id'])>0 ?json_encode($requireData['address_arr_id']):'';
 
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?end($requireData['native_place_arr_id']):0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id'])>0?json_encode($requireData['native_place_arr_id']):'';
 
-        $requireData['city_id'] = isset($requireData['city_arr_id'])?end($requireData['city_arr_id']):0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id'])?json_encode($requireData['city_arr_id']):'';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?end($requireData['city_arr_id']):0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id'])>0?json_encode($requireData['city_arr_id']):'';
 
         $requireData['other'] = isset($requireData['other'])?json_encode($requireData['other']):'';
         $requireData['admin_id'] = Context::get("UserId");

app/Controller/WebsiteController.php

@@ -700,7 +700,7 @@ class WebsiteController extends AbstractController
         $typeId = intval(Context::get("TypeId"));
         var_dump("用户类型：",$typeId);
         switch ($typeId){
-            case 1:
+            case 4:
                 $dates = [];
                 $startDate = (new DateTime())->modify('-29 day'); // 从 29 天前开始（因为我们要 30 天，包括今天的前一天）
                 for ($i = 0; $i < 30; $i++) {

runtime/container/proxy/App_Controller_UserController.proxy.php

@@ -69,14 +69,14 @@ class UserController extends AbstractController
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
         $requireData['admin_id'] = Context::get("UserId");
-        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) ? end($requireData['administrative_unit_arr_id']) : 0;
-        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) ? json_encode($requireData['administrative_unit_arr_id']) : '';
-        $requireData['address_id'] = isset($requireData['address_arr_id']) ? end($requireData['address_arr_id']) : 0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) ? json_encode($requireData['address_arr_id']) : '';
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) ? end($requireData['native_place_arr_id']) : 0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) ? json_encode($requireData['native_place_arr_id']) : '';
-        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id']) > 0 ? end($requireData['administrative_unit_arr_id']) : 0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id']) > 0 ? json_encode($requireData['administrative_unit_arr_id']) : '';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? json_encode($requireData['address_arr_id']) : '';
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? json_encode($requireData['native_place_arr_id']) : '';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? json_encode($requireData['city_arr_id']) : '';
         $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
         $result = $this->userServiceClient->createUser($requireData);
         return $result['code'] == 200 ? Result::success($result['data']) : Result::error($result['message']);
@@ -103,14 +103,14 @@ class UserController extends AbstractController
         }
         $loginIp = $this->request->getHeader('x-forwarded-for')[0] ?? $this->request->getHeader('x-real-ip')[0] ?? $this->request->getServerParams()['remote_addr'] ?? '0.0.0.0';
         $requireData['last_login_ip'] = $loginIp;
-        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) ? end($requireData['administrative_unit_arr_id']) : 0;
-        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) ? json_encode($requireData['administrative_unit_arr_id']) : '';
-        $requireData['address_id'] = isset($requireData['address_arr_id']) ? end($requireData['address_arr_id']) : 0;
-        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) ? json_encode($requireData['address_arr_id']) : '';
-        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) ? end($requireData['native_place_arr_id']) : 0;
-        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) ? json_encode($requireData['native_place_arr_id']) : '';
-        $requireData['city_id'] = isset($requireData['city_arr_id']) ? end($requireData['city_arr_id']) : 0;
-        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) ? json_encode($requireData['city_arr_id']) : '';
+        $requireData['administrative_unit_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id']) > 0 ? end($requireData['administrative_unit_arr_id']) : 0;
+        $requireData['administrative_unit_arr_id'] = isset($requireData['administrative_unit_arr_id']) && count($requireData['administrative_unit_arr_id']) > 0 ? json_encode($requireData['administrative_unit_arr_id']) : '';
+        $requireData['address_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? end($requireData['address_arr_id']) : 0;
+        $requireData['address_arr_id'] = isset($requireData['address_arr_id']) && count($requireData['address_arr_id']) > 0 ? json_encode($requireData['address_arr_id']) : '';
+        $requireData['native_place_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? end($requireData['native_place_arr_id']) : 0;
+        $requireData['native_place_arr_id'] = isset($requireData['native_place_arr_id']) && count($requireData['native_place_arr_id']) > 0 ? json_encode($requireData['native_place_arr_id']) : '';
+        $requireData['city_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? end($requireData['city_arr_id']) : 0;
+        $requireData['city_arr_id'] = isset($requireData['city_arr_id']) && count($requireData['city_arr_id']) > 0 ? json_encode($requireData['city_arr_id']) : '';
         $requireData['other'] = isset($requireData['other']) ? json_encode($requireData['other']) : '';
         $requireData['admin_id'] = Context::get("UserId");
         $result = $this->userServiceClient->updateUser($requireData);

runtime/container/proxy/App_Controller_WebsiteController.proxy.php

@@ -456,7 +456,7 @@ class WebsiteController extends AbstractController
         $typeId = intval(Context::get("TypeId"));
         var_dump("用户类型：", $typeId);
         switch ($typeId) {
-            case 1:
+            case 4:
                 $dates = [];
                 $startDate = (new DateTime())->modify('-29 day');
                 // 从 29 天前开始（因为我们要 30 天，包括今天的前一天）