From dc9239d73b15b9a51c46a9e8d25c0d4400e613ce Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 29 七月 2024 09:17:54 +0800
Subject: [PATCH] 7.29
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/UserManageController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 227b545..5e310fa 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,8 @@
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;
@@ -58,6 +60,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("user_list")
@ApiOperation(value = "用户管理-用户分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -85,6 +88,7 @@
*
* @param id 前台用户id
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户管理-用户详情", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -99,6 +103,7 @@
*
* @param ids 前台用户多条id拼接
*/
+ @RequiresPermissions("user_delete")
@ApiOperation(value = "用户管理-批量删除用户", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -119,6 +124,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-订单记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/orderList")
@ApiImplicitParams({
@@ -133,7 +139,8 @@
if (null == loginUser) {
return R.loginExpire("登录失效！");
}
- return R.ok(orderClient.orderList(userId, pageNum, pageSize).getData());
+ R<Page<Order>> iPageR = orderClient.orderList(userId, pageNum, pageSize);
+ return R.ok(iPageR.getData());
}
/**
@@ -144,6 +151,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-评价记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/evaluateList")
@ApiImplicitParams({
@@ -162,6 +170,7 @@
*
* @param id 评价记录id
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-删除评价记录", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/deleteEvaluateRecord")
@ApiImplicitParams({
@@ -176,6 +185,7 @@
*
* @return 操作结果
*/
+ @RequiresPermissions("user_withdrawal_setting")
@ApiOperation(value = "关闭/开启审核", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/enableProcess")
@ApiImplicitParams({
@@ -213,6 +223,7 @@
* @param pageSize 每页显示条数
* @return 分页列表
*/
+ @RequiresPermissions("user_detail")
@ApiOperation(value = "用户详情-提现记录分页列表", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/withdrawList")
@ApiImplicitParams({
@@ -231,6 +242,7 @@
*
* @param id 提现记录id
*/
+ @RequiresPermissions(value = {"user_detail", "user_withdrawal_delete"}, logical = Logical.OR)
@ApiOperation(value = "用户详情/用户提现管理-删除提现记录", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/deleteWithdrawRecord")
@ApiImplicitParams({
@@ -247,6 +259,7 @@
* @param state 审批结果
* @param opinion 审批意见
*/
+ @RequiresPermissions(value = {"user_detail", "user_withdrawal_audit"}, logical = Logical.OR)
@ApiOperation(value = "用户详情/用户提现管理-提现审批", tags = {"后台-用户管理-用户列表"})
@GetMapping(value = "/withdrawExamine")
@ApiImplicitParams({
@@ -254,7 +267,7 @@
@ApiImplicitParam(value = "审批意见", name = "opinion", dataType = "String"),
@ApiImplicitParam(value = "审批同意/不同意(1同意;2驳回)", name = "state", dataType = "Integer", required = true)
})
- public R<String> withdrawExamine(@RequestParam Integer id, @RequestParam Integer state, String opinion) {
+ public R<String> withdrawExamine(@RequestParam Long id, @RequestParam Integer state, String opinion) {
com.ruoyi.order.api.entity.Withdraw withdraw = withdrawClient.withdrawRecordDetail(id).getData();
if (null == withdraw) {
throw new GlobalException("提现记录不存在或已删除！");
--
Gitblit v1.7.1