Merge remote-tracking branch 'origin/master'

src/main/java/com/gree/mall/contest/controller/mini/user/MiniUserController.java

@@ -224,4 +224,29 @@ public class MiniUserController {
         return ResponseHelper.success();
     }
 
+    @PostMapping("/password/update")
+    @Operation(summary = "修改密码")
+    public ResponseHelper<AdminUserBean> login(
+            @Parameter(description = "帐号", required = true) @RequestParam String userName,
+            @Parameter(description = "密码", required = true) @RequestParam String password,
+            @Parameter(description = "新密码", required = true) @RequestParam String newPassword
+    ) throws RemoteServiceException {
+        adminUserLogic.updatePassword(userName, password, newPassword);
+        return ResponseHelper.success();
+    }
+
+    @GetMapping("/detail")
+    @Operation(summary = "详情")
+    public ResponseHelper<AdminUserBean> miniDetail() throws RemoteServiceException {
+        AdminUserBean detail = adminUserLogic.miniDetail();
+        return ResponseHelper.success(detail);
+    }
+
+    @PostMapping("/logout")
+    @Operation(summary = "退出登录")
+    public ResponseHelper logout(HttpServletRequest request) {
+        adminUserLogic.logout(request);
+        return ResponseHelper.success();
+    }
+
 }

src/main/java/com/gree/mall/contest/logic/admin/AdminUserLogic.java

@@ -670,4 +670,15 @@ public class AdminUserLogic {
 
         return adminUserBean;
     }
+
+    public AdminUserBean miniDetail() {
+        final String adminUserId = CommonUtils.getUserId();
+        AdminUser adminUser = adminUserService.getById(adminUserId);
+        AdminUserBean adminUserBean = new AdminUserBean();
+        BeanUtils.copyProperties(adminUser, adminUserBean);
+        //服务商对象
+        Merchant merchant = merchantService.getById(adminUser.getServiceProviderId());
+        adminUserBean.setMerchant(merchant);
+        return adminUserBean;
+    }
 }