用户信息变更

schoolNewsServ/usercenter/src/main/java/org/xyzh/usercenter/controller/UserProfileController.java

@@ -56,15 +56,34 @@ public class UserProfileController {
      * 更新个人信息
      */
     @PutMapping("/info/update")
-    public ResultDomain<TbSysUserInfo> updateUserProfile(@HttpLogin LoginDomain loginDomain, @RequestBody TbSysUserInfo userInfo) {
-        // TODO: 实现更新个人信息（姓名、部门、联系方式等）
-        ResultDomain<TbSysUserInfo> result = userService.updateUserInfo(userInfo);
-        if (result.isSuccess()) {
+    public ResultDomain<UserVO> updateUserProfile(@HttpLogin LoginDomain loginDomain, @RequestBody UserVO userVO) {
+        ResultDomain<UserVO> result = new ResultDomain<>();
+        // 更新tb_sys_user
+        TbSysUser user = new TbSysUser();
+        user.setID(userVO.getUserID());
+        user.setUsername(userVO.getUsername());
+        user.setEmail(userVO.getEmail());
+        user.setPhone(userVO.getPhone());
+        ResultDomain<TbSysUser> re = userService.updateUser(user);
+        if (!re.isSuccess()) {
+            result.fail(re.getMessage());
+            return result;
+        }
+
+        // 更新tb_sys_user_info
+        TbSysUserInfo userInfo = new TbSysUserInfo();
+        userInfo.setUserID(userVO.getUserID());
+        userInfo.setAvatar(userVO.getAvatar());
+        userInfo.setGender(userVO.getGender());
+        userInfo.setStudentId(userVO.getStudentId());
+
+        ResultDomain<TbSysUserInfo> result1 = userService.updateUserInfo(userInfo);
+        if (result1.isSuccess()) {
+            result.success("个人信息更新成功", userVO);
             return result;
         } else {
-            ResultDomain<TbSysUserInfo> result2 = new ResultDomain<>();
-            result2.fail(result.getCode(), result.getMessage());
-            return result2;
+            result.fail(result1.getCode(), result1.getMessage());
+            return result;
         }
     }