From f8cc44e926fd22f9d1d864dc684c827f6960270b Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期五, 26 七月 2024 11:51:30 +0800
Subject: [PATCH] feat: 最新代码及配置
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
index 6c75ca6..52bc90a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java
@@ -8,6 +8,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.entity.EvaluatePageVO;
import com.ruoyi.order.api.entity.Order;
import com.ruoyi.order.api.entity.UserWithdrawRecordVO;
@@ -15,6 +18,7 @@
import com.ruoyi.order.api.feignClient.EvaluateClient;
import com.ruoyi.order.api.feignClient.OrderClient;
import com.ruoyi.order.api.feignClient.WithdrawClient;
+import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -47,6 +51,8 @@
private EvaluateClient evaluateClient;
@Resource
private WithdrawClient withdrawClient;
+ @Resource
+ private TokenService tokenService;
/**
* 用户信息分页列表
@@ -54,6 +60,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("user_list")
@ApiOperation(value = "用户管理-用户分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -81,6 +88,7 @@
*
* @param id 前台用户id
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户管理-用户详情", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -95,6 +103,7 @@
*
* @param ids 前台用户多条id拼接
*/
+ @RequiresPermissions("user_delete")
@ApiOperation(value = "用户管理-批量删除用户", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -115,6 +124,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-订单记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/orderList")
@ApiImplicitParams({
@@ -125,6 +135,10 @@
public R<IPage<Order>> orderList(@RequestParam("userId") Integer userId,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (null == loginUser) {
+ return R.loginExpire("登录失效！");
+ }
return R.ok(orderClient.orderList(userId, pageNum, pageSize).getData());
}
@@ -136,6 +150,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-评价记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/evaluateList")
@ApiImplicitParams({
@@ -154,6 +169,7 @@
*
* @param id 评价记录id
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-删除评价记录", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/deleteEvaluateRecord")
@ApiImplicitParams({
@@ -168,6 +184,7 @@
*
* @return 操作结果
*/
+ @RequiresPermissions("user_withdrawal_setting")
@ApiOperation(value = "关闭/开启审核", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/enableProcess")
@ApiImplicitParams({
@@ -205,6 +222,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-提现记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/withdrawList")
@ApiImplicitParams({
@@ -223,6 +241,7 @@
*
* @param id 提现记录id
*/
+ @RequiresPermissions(value = {"user_detail", "user_withdrawal_delete"}, logical = Logical.OR)
@ApiOperation(value = "用户详情/用户提现管理-删除提现记录", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/deleteWithdrawRecord")
@ApiImplicitParams({
@@ -239,6 +258,7 @@
* @param state 审批结果
* @param opinion 审批意见
*/
+ @RequiresPermissions(value = {"user_detail", "user_withdrawal_audit"}, logical = Logical.OR)
@ApiOperation(value = "用户详情/用户提现管理-提现审批", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/withdrawExamine")
@ApiImplicitParams({
--
Gitblit v1.7.1