From 9aa9ffc0b963f06aff7c856f22d3f95c9995eb43 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Tue, 23 Apr 2024 02:11:20 +0800
Subject: [PATCH] init

---
 .../com/ruoyi/xq/controller/UserController.java  | 16 +++++++++++++---
 .../xq/dto/admin/user/UserAdminUpdateVo.java     | 10 ++++++++++
 .../ruoyi/xq/dto/admin/user/req/AddUserReq.java  |  2 ++
 .../xq/dto/admin/user/req/UpdateUserReq.java     |  2 ++
 .../ruoyi/xq/service/impl/UserServiceImpl.java   |  6 ++++++
 5 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserAdminUpdateVo.java

diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java
index 655a347..fb35849 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/UserController.java
@@ -12,14 +12,18 @@ import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.BeanConvertUtil;
 import com.ruoyi.xq.domain.User;
+import com.ruoyi.xq.domain.UserInfo;
 import com.ruoyi.xq.dto.admin.user.FullUserVo;
+import com.ruoyi.xq.dto.admin.user.UserAdminUpdateVo;
 import com.ruoyi.xq.dto.admin.user.UserAdminVo;
 import com.ruoyi.xq.dto.admin.user.req.AddUserReq;
 import com.ruoyi.xq.dto.admin.user.req.ResetPasswordAdminReq;
 import com.ruoyi.xq.dto.admin.user.req.UpdateMobileAdminReq;
 import com.ruoyi.xq.dto.admin.user.req.UpdateUserReq;
 import com.ruoyi.xq.dto.app.common.IdReq;
+import com.ruoyi.xq.service.UserInfoService;
 import com.ruoyi.xq.service.UserInviteService;
 import com.ruoyi.xq.service.UserService;
 import lombok.RequiredArgsConstructor;
@@ -47,6 +51,8 @@ public class UserController extends BaseController {
 
     private final UserService userService;
     private final UserInviteService userInviteService;
+    private final UserInfoService userInfoService;
+
 
     /**
      * 查询用户管理列表
@@ -159,9 +165,13 @@ public class UserController extends BaseController {
      */
     @SaCheckPermission("xq:user:query")
     @GetMapping("/{id}")
-    public R<User> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
-        return R.ok(userService.getById(id));
+    public R<UserAdminUpdateVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
+        User user = userService.getById(id);
+        UserInfo userInfo = userInfoService.getByUserId(user.getId());
+        UserAdminUpdateVo res = BeanConvertUtil.convertTo(user, UserAdminUpdateVo::new);
+        res.setCarStatus(userInfo.getCarStatus());
+        res.setHousingStatus(userInfo.getHousingStatus());
+        return R.ok(res);
     }
 
     /**
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserAdminUpdateVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserAdminUpdateVo.java
new file mode 100644
index 0000000..078647b
--- /dev/null
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/UserAdminUpdateVo.java
@@ -0,0 +1,10 @@
+package com.ruoyi.xq.dto.admin.user;
+
+import com.ruoyi.xq.domain.User;
+import lombok.Data;
+
+@Data
+public class UserAdminUpdateVo extends User {
+    private Integer carStatus;
+    private Integer housingStatus;
+}
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
index 206d3aa..64c0853 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/AddUserReq.java
@@ -23,4 +23,6 @@ public class AddUserReq {
     private Integer annualIncome;
     private Integer forPersonals;
     private String pictures;
+    private Integer carStatus;
+    private Integer housingStatus;
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserReq.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserReq.java
index b5aafa7..0046d50 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserReq.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/user/req/UpdateUserReq.java
@@ -21,4 +21,6 @@ public class UpdateUserReq {
     private String profession;
     private Integer forPersonals;
     private Integer annualIncome;
+    private Integer carStatus;
+    private Integer housingStatus;
 }
diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
index 6d4a9fc..d991c51 100644
--- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
+++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/UserServiceImpl.java
@@ -395,6 +395,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper,User> implements Use
         updateUser.setProfession(updateUserReq.getProfession());
         updateUser.setAnnualIncome(updateUserReq.getAnnualIncome());
         this.updateById(updateUser);
+        if(updateUserReq.getCarStatus() != null || updateUserReq.getHousingStatus() != null){
+            userInfoService.update(Wrappers.lambdaUpdate(UserInfo.class)
+                    .eq(UserInfo::getUserId, user.getId())
+                    .set(updateUserReq.getCarStatus() != null,UserInfo::getCarStatus, updateUserReq.getCarStatus())
+                    .set(updateUserReq.getHousingStatus() != null,UserInfo::getHousingStatus, updateUserReq.getHousingStatus()));
+        }
         this.checkFinishStatus(user.getId());
     }