From 32866c0896969b3ac6f3eaddf0420507708c9c52 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 17 五月 2024 16:28:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
index d63cb2f..c12df85 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/controller/TUserController.java
@@ -19,10 +19,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -34,7 +31,7 @@
* @author 无关风月
* @since 2024-04-26
*/
-@Controller
+@RestController
@RequestMapping("/tUser")
public class TUserController {
@Autowired
@@ -44,7 +41,6 @@
@Autowired
private StudyClient studyClient;
- @ResponseBody
@PostMapping("/userList")
@ApiOperation(value = "用户列表", tags = {"用户管理"})
public AjaxResult<PageInfo<AppUserVO>> couponReceive(AppUserQuery query) {
@@ -63,12 +59,11 @@
//// }
//// res.setRecords(list);
//// res.setTotal(list.size());
- R<PageInfo<AppUserVO>> pageInfoR = studyClient.couponReceive(query);
+ PageInfo<AppUserVO> data = studyClient.couponReceive(query).getData();
- return AjaxResult.success(pageInfoR);
+ return AjaxResult.success(data);
}
- @ResponseBody
@PostMapping("/getUserInfo")
@ApiOperation(value = "查看用户详情", tags = {"用户管理"})
public AjaxResult<UserInfoVO> getUserInfo(UserInfoQuery dto) {
@@ -116,7 +111,6 @@
return AjaxResult.success(data);
}
- @ResponseBody
@PostMapping("/freeze")
@ApiOperation(value = "冻结/解冻", tags = {"用户管理"})
public AjaxResult freeze(Integer id) {
@@ -129,14 +123,18 @@
return AjaxResult.success("解冻成功");
}
}
- @ResponseBody
@PostMapping("/getVipSet")
@ApiOperation(value = "获取会员设置", tags = {"用户管理"})
public AjaxResult<List<TVipSet>> getVipSet() {
List<TVipSet> list = vipSetService.list(new QueryWrapper<TVipSet>().orderByAsc("amount"));
return AjaxResult.success(list);
}
- @ResponseBody
+ @PostMapping("/getVipSet1")
+ @ApiOperation(value = "获取会员设置", tags = {"家长端"})
+ public R<List<TVipSet>> getVipSet1() {
+ List<TVipSet> list = vipSetService.list(new QueryWrapper<TVipSet>().orderByAsc("amount"));
+ return R.ok(list);
+ }
@PostMapping("/setVipSet")
@ApiOperation(value = "获取会员设置", tags = {"用户管理"})
public AjaxResult setVipSet(@RequestBody VipSetVO vo) {
@@ -150,7 +148,6 @@
}
return AjaxResult.success("保存成功");
}
- @ResponseBody
@PostMapping("/vipOrderList")
@ApiOperation(value = "列表查询", tags = {"会员管理"})
public AjaxResult<PageInfo<VipOrderVO>> vipOrderList(AppUserQuery query) {
@@ -158,5 +155,11 @@
PageInfo<VipOrderVO> data = studyClient.vipOrderList(query).getData();
return AjaxResult.success(data);
}
+ @PostMapping("/vipBack")
+ @ApiOperation(value = "会员退款", tags = {"会员管理"})
+ public AjaxResult vipOrderList(Integer id) {
+ studyClient.vipBack(id);
+ return AjaxResult.success();
+ }
}
--
Gitblit v1.7.1