1111

app/JsonRpc/UserService.php

@@ -28,13 +28,13 @@ class UserService implements UserServiceInterface
             $dataUserReq = [
                 'user_name' => $data['user_name'],
                 'password' => md5(md5($data['password']) . $data['salt']),
-                'avatar' => $data['avatar'] ?? '',
+                'avatar' => $data['avatar'] ?? 'http://183.131.25.186:9501/image/20241212/1733992868958074.png',
                 'type_id' => $data['type_id'] ?? '20000',
                 'mobile' => $data['mobile'] ?? '', //手机号
                 'status' => $data['status'] ?? 1,
                 'email' => $data['email'] ?? '',
                 'salt' => $data['salt'],
-                'admin_id' => $data['admin_id'],
+                'admin_id' => isset($data['admin_id']) && $data['admin_id'] != '' ? $data['admin_id'] : 0,
 //                'level_id'=>$data['level_id']??0, //会员等级
                 'nickname' => $data['nickname'] ?? '',
                 'last_login_ip' => $data['last_login_ip'] ?? '',
@@ -76,9 +76,9 @@ class UserService implements UserServiceInterface
 
             $userInfoId = UserInfo::query()->insertGetId($dataUserInfoReq);
             $roleUserData = [
-                'role_id' => $data['role_id'],
+                'role_id' => isset($data['role_id']) && $data['role_id'] != '' ? $data['role_id'] : 0,
                 'user_id' => $userid,
-                'admin_user_id' => $data['admin_id'],
+                'admin_user_id' => isset($data['admin_id']) && $data['admin_id'] != '' ? $data['admin_id'] : 0,
             ];
             RoleUser::insert($roleUserData);
             var_dump("userInfo:", $userInfoId);
@@ -109,17 +109,21 @@ class UserService implements UserServiceInterface
 
         $result = User::where($where)
             ->leftJoin('user_info', 'user.id', '=', 'user_info.user_id')
-            ->leftJoin("user as userA", 'user.admin_id', "userA.id")
+            ->leftJoin("user_info as user_infoA", 'user.admin_id', "user_infoA.user_id")
+            ->leftJoin("role_user", 'role_user.user_id', "user.id")
+            ->leftJoin("role", 'role.id', "role_user.role_id")
             ->orderBy("user.id", "desc")->paginate(intval($data['pageSize']),
             [
                 'user.id',
+                'user.admin_id',
                 'user.user_name',
                 'user_info.real_name',
                 'user.mobile',
                 'user.type_id',
                 'user.created_at',
                 'user.status',
-                'userA.nickname as admin_nickname',
+                'user_infoA.real_name as admin_real_name',
+                'role.role_name',
             ],
             'page', intval($data['page']));
 
@@ -202,6 +206,7 @@ class UserService implements UserServiceInterface
      */
     public function verifyUserInfo(array $data): array
     {
+        var_dump("进不进来");
         if (isset($data['id'])) {
             $data[] = ['id', "!=", $data['id']];
             unset($data['id']);
@@ -306,6 +311,26 @@ class UserService implements UserServiceInterface
         return 1;
     }
 
+    /**
+     * @param array $data
+     * @return array|int
+     */
+    public function resetPassword(array $data): array
+    {
+        $where = [
+            'id' => $data['id'],
+        ];
+        $data = [
+            'password' => md5(md5($data['password']) . $data['salt']),
+            'salt' => $data['salt'],
+        ];
+        $result = User::where($where)->update($data);
+        if ($result) {
+            return Result::error("修改失败", 0);
+        } else {
+            return Result::success([]);
+        }
+    }
     /**
      * @param int $id
      * @return array
@@ -505,8 +530,8 @@ class UserService implements UserServiceInterface
         } else {
             return Result::error('修改失败');
         }
-
     }
+
     /**
      * 修改用户头像昵称
      * @param array $data
@@ -514,16 +539,34 @@ class UserService implements UserServiceInterface
      */
     public function updateUserAvatarNickname(array $data): array
     {
-        $where = [
-            'id' => $data['user_id'],
-        ];
-        unset($data['user_id']);
-        $result = User::where($where)->update($data);
-        if ($result) {
-            $result = User::where($where)->get();
+        Db::beginTransaction();
+        try {
+            $updateData = [];
+            $where1 = [
+                'id' => $data['user_id'],
+            ];
+            if (!empty($data['nickname'])) {
+                $updateData = ['nickname' => $data['nickname']];
+            }
+            if (!empty($data['avatar'])) {
+                $updateData = ['avatar' => $data['avatar']];
+            }
+            $result = User::where($where1)->update($updateData);
+            $updateData = [];
+            $where = [
+                'user_id' => $data['user_id'],
+            ];
+            if (!empty($data['real_name'])) {
+                $updateData = ['real_name' => $data['real_name']];
+            }
+            $result = UserInfo::where($where)->update($updateData);
+            $result = User::where($where1)->first();
+            Db::commit();
             return Result::success($result);
-        } else {
-            return Result::error('修改失败');
+        } catch (\Throwable $ex) {
+            Db::rollBack();
+            var_dump($ex->getMessage());
+            return Result::error("创建失败", 0);
         }
     }
 }