From 7c4209d69ca4b4394658b60351d6a2ce5669e8a6 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Fri, 7 Jul 2023 15:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/v1/setting/SystemRoute.php     | 25 ++++++++++---------
 crmeb/app/outapi/controller/User.php          |  3 ++-
 .../services/system/SystemRouteServices.php   |  4 +--
 crmeb/app/services/user/OutUserServices.php   | 13 +++++++++-
 4 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php b/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php
index a8d175401..ebb7415a3 100644
--- a/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php
+++ b/crmeb/app/adminapi/controller/v1/setting/SystemRoute.php
@@ -111,24 +111,25 @@ class SystemRoute extends AuthController
             ['describe', ''],
         ]);
 
-        if (!$data['name']) {
-            return app('json')->fail(500031);
-        }
-        if (!$data['path']) {
-            return app('json')->fail(500032);
-        }
-        if (!$data['method']) {
-            return app('json')->fail(500033);
-        }
-        if (!$data['app_name']) {
-            return app('json')->fail(500034);
-        }
+//        if (!$data['name']) {
+//            return app('json')->fail(500031);
+//        }
+//        if (!$data['path']) {
+//            return app('json')->fail(500032);
+//        }
+//        if (!$data['method']) {
+//            return app('json')->fail(500033);
+//        }
+//        if (!$data['app_name']) {
+//            return app('json')->fail(500034);
+//        }
         if ($id) {
             $this->services->update($id, $data);
         } else {
             $data['add_time'] = date('Y-m-d H:i:s');
             $this->services->save($data);
         }
+        $this->services->cacheDriver()->clear();
 
         return app('json')->success($id ? 100001 : 100021);
     }
diff --git a/crmeb/app/outapi/controller/User.php b/crmeb/app/outapi/controller/User.php
index 60ac589fe..49d009376 100644
--- a/crmeb/app/outapi/controller/User.php
+++ b/crmeb/app/outapi/controller/User.php
@@ -130,7 +130,8 @@ class User extends AuthController
     public function info($uid)
     {
         if (!$uid) return app('json')->fail(100100);
-        return app('json')->success($this->services->userInfo($uid));
+        $data = $this->services->userInfo($uid);
+        return app('json')->success(compact('data'));
     }
 
     /**
diff --git a/crmeb/app/services/system/SystemRouteServices.php b/crmeb/app/services/system/SystemRouteServices.php
index 4d496df46..2a3ce1cb0 100644
--- a/crmeb/app/services/system/SystemRouteServices.php
+++ b/crmeb/app/services/system/SystemRouteServices.php
@@ -84,7 +84,7 @@ class SystemRouteServices extends BaseServices
      */
     public function getTreeList(string $appName = 'adminapi', string $name = '')
     {
-        return $this->cacheDriver()->remember('ROUTE_LIST' . strtoupper($appName), function () use ($name, $appName) {
+//        return $this->cacheDriver()->remember('ROUTE_LIST' . strtoupper($appName), function () use ($name, $appName) {
             $list = app()->make(SystemRouteCateServices::class)
                 ->selectList(['app_name' => $appName], '*', 0, 0, 'id asc,sort desc', [
                     'children' => function ($query) use ($name, $appName) {
@@ -110,7 +110,7 @@ class SystemRouteServices extends BaseServices
                 }
             }
             return get_tree_children($list);
-        }, 600);
+//        }, 600);
     }
 
     /**
diff --git a/crmeb/app/services/user/OutUserServices.php b/crmeb/app/services/user/OutUserServices.php
index 19debd700..1620ae8b1 100644
--- a/crmeb/app/services/user/OutUserServices.php
+++ b/crmeb/app/services/user/OutUserServices.php
@@ -15,6 +15,7 @@ namespace app\services\user;
 
 use app\dao\user\UserDao;
 use app\services\activity\coupon\StoreCouponIssueServices;
+use app\services\agent\AgentLevelServices;
 use app\services\BaseServices;
 use app\services\system\SystemUserLevelServices;
 use crmeb\exceptions\ApiException;
@@ -92,9 +93,19 @@ class OutUserServices extends BaseServices
      */
     public function userInfo($uid)
     {
+        $userType = ['h5' => 'H5', 'wechat' => '公众号', 'routine' => '小程序', 'app' => 'APP', 'pc' => 'PC'];
         $fields = ['uid', 'real_name', 'mark', 'nickname', 'avatar', 'phone', 'now_money', 'brokerage_price', 'integral', 'exp', 'sign_num', 'user_type', 'status', 'level',
             'agent_level', 'spread_open', 'spread_uid', 'spread_time', 'user_type', 'is_promoter', 'pay_count', 'is_ever_level', 'is_money_level', 'overdue_time', 'add_time'];
-        return app()->make(UserServices::class)->get($uid, $fields);
+        $data = app()->make(UserServices::class)->get($uid, $fields);
+        $data['user_type'] = $userType[$data['user_type']];
+        $data['status'] = $data['status'] ? '正常' : '禁用';
+        $data['level'] = app()->make(SystemUserLevelServices::class)->value($data['level'], 'name') ?? '无';
+        $data['agent_level'] = app()->make(AgentLevelServices::class)->value($data['agent_level'], 'name') ?? '无';
+        $data['spread_open'] = $data['spread_open'] ? '分销开启' : '分销关闭';
+        $data['spread_name'] = app()->make(UserServices::class)->value($data['spread_uid'], 'nickname') ?? '无';
+        $data['spread_time'] = date('Y-m-d H:i:s', $data['spread_time']);
+        $data['add_time'] = date('Y-m-d H:i:s', $data['add_time']);
+        return $data;
     }
 
     /**